added chatroom controller
merged tye's chat room controller into master