some stuff
Merge branch 'master' of https://github.com/Jasper42/TheRealm

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