fix branches
deploying heroku
Adding style
Merging with development