Merge pull request #4 from chrisb1510/master

merging for tidyup, got confusing
Merge pull request #5 from chrisb1510/chatrooms

Merge pull request #4 from chrisb1510/master