Add chatroom
Merge branch 'master' of https://github.com/chasm/mockingbird

We really need this man
fixed changes from 2nd template change damnit