made ready for heroku
Merge branch 'benson' of https://github.com/pm98/HackDuke14

Conflicts:
	requirements.txt