Style almost done
Last efforts made
Update to Heroku
Merge branch 'test_heroku'