Update readme
Update gemfile.lock
Merge branch 'initial-db-setup'