Configuring database to work with heroku
Merge branch 'master' of heroku.com:fathomless-sea-3417
Fixing bootstrap asset error