Added structure to deploy on heroku
Apply styling
resolve merge conflictes