Update pg gemfile
Add Gemfile.lock with postgres
Change Gemfile back to sqlite3
Resolve Gemfile conflict