made ready for heroku

Conflicts:
	requirements.txt
Merge branch 'master' of https://github.com/pm98/HackDuke14

Conflicts:
	requirements.txt
Added reply event_data