init
change requirements file
heroku commit
change config
added heroku stuff
fixed merge conflicts