x
Merge branch 'master' of https://github.com/Jasper42/TheRealm.git

Conflicts:
	TheRealm/src/com/theRealm/client/Client.java