From: Ben Beltran <redacted>
Date: Mon, 3 Feb 2014 15:51:07 +0000 (-0600)
Subject: Merge branch 'master' of github.com:benbeltran/super-polarity
X-Git-Url: https://git.r.bdr.sh/rbdr/super-polarity/commitdiff_plain/3de51c6f55d304f038df1b77c8ab346e2a187fe1?hp=3de51c6f55d304f038df1b77c8ab346e2a187fe1

Merge branch 'master' of github.com:benbeltran/super-polarity

Conflicts:
	.gitignore
---