Starting over...yet again.
Merge branch 'master' of https://github.com/HerobrinesArmy/ChatInterfaces

Conflicts:
	JavaClient/src/com/herobrinesarmy/javaclient/Client.java