Let's have some server stuff happen
Merge branch 'master' of https://github.com/Bro-Pals/RectangleWorld

Conflicts:
	RectangleWorldClient.jar
	RectangleWorldServer.jar

the conflicts are okey dokey