test
Merge branch 'master' of https://github.com/RoOoBerT/awar-client.git

Conflicts:
	src/main/java/com/ageofnoobs/avatarwar/client/gui/Gui.java