merge Heroku test in master

tested working on localhost and heroku