m9
asdfasdfasdf
Merge branch 'master' of https://github.com/XepherX/SMURT

Conflicts:
	src/net/smurtgame/Game.java