Automatic commit by Potion as part of deploy: 2014-11-15 18:01:52 -0500
Automatic commit by Potion as part of deploy: 2014-11-15 18:03:10 -0500
Merge branch 'gh-pages' of github.com:aarongough/goughcustom into gh-pages

Conflicts:
	potion_deploy.txt
Automatic commit by Potion as part of deploy: 2014-11-15 18:04:56 -0500