log updated
added pg databse to gemfile
log
fixed db merge conflict