Merged GameServer
Merge branch 'master' of https://github.com/rasmusolofzon/Piaette.git

Conflicts:
	piaette/src/server/GameServer.java