Initial commit
prepping for heroku
Merge branch 'master' of https://github.com/insaneshane/programmed-insanity

Conflicts:
	README.md
Merge branch 'master' of https://github.com/insaneshane/programmed-insanity

Conflicts:
	README.md