switched to postgresql
merge
gemfile
fixed conflict
Merge pull request #11 from victorpearson/postgres

Postgres