I did some stuff and then you made me commit.
Merge branch 'master' of https://github.com/DizzyThermal/JChatroom.git
Merge branch 'master' of https://github.com/DizzyThermal/JChatroom.git