two passing tests
Merge branch 'master' of github.com:jallentucker/chatter