added rspec activemodel to gemfile
using devise for testing current user
some progress on user controller spec
join failure spec
gemfile.loick merge conflics resolved
Merge pull request #33 from brandonmanson/users-join-test

Users join test