reword tests
Merge branch 'master' of https://github.com/purple-martins-2013/live-together into testing-cmm
controller tests for grocery_lists
house_controller test
Merge pull request #54 from purple-martins-2013/testing-cmm

Testing cmm