add some associations b/w models
update gemfile.lock
Merge branch 'devise'

Because 'bundle install' was ran on the master branch before working on the devise branch