Updated gitignore for heroku
Refactored.
Merged