mod GemFile to Postgres
mod not to use DB
Merge remote-tracking branch 'origin/master'