GUI chatfield && checkstyle
Fixed merge conflicts in clientHandler && serverProtocol
Merge conflicts