Add platform and ruby to Gemfile
Update db config
Update procfile app path
Update procfile app path
Fix conflict
Merge branch 'master' of github.com:rosedu/GRails