heroku push
Merge remote-tracking branch 'origin/master'

Conflicts:
	requirements.txt
heroku