Installed postgres
gemfile
gemfile
Commit
Merged development with master