gemfile changed
merging master in pull
Merge branch 'master' of https://github.com/brandonmanson/abode into user-controller-tests
merging user from master file
Merge pull request #8 from brandonmanson/assoc_and_seed

Assoc and seed
started user controller sign up spec
merging master changes
user controller tests done
Merge pull request #9 from brandonmanson/user-controller-tests

User controller tests
Resolving merge conflict in user model