adapting to heroku [6]
adapting to heroku [7]
adaption to heroku final (i hope)