Almost done with the chatroom
Merged Nick's files into mine