installed pg gem and fix external sytle problem
Configured for deployment to Heroku
new assets
resolving a merge conflict