some changes to model
fixing merge conflicts
fixing further merge conflicts
Merge branch 'master' of https://github.com/mjsteichen/PairBnB

pulling down master
Merge branch 'master' of https://github.com/mjsteichen/PairBnB

merging master
finished testing for user controller's new and create
issues with helper method interfering with residence controller create specs
adding session tests with capybara
hehehe fixing a tiny error
Merge pull request #6 from mjsteichen/controller-specs

Controller specs