oh god please stahp
Merge branch 'master' of https://github.com/XepherX/SMURT

Conflicts:
	bin/net/smurtgame/Game.class