Merge branch 'develop'
Merge branch 'develop'
Install Gem for Heroku
Install Gem for Heroku
Change Database to P.G.
Add config/database.yml
Merge branch 'master' into develop