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

Conflicts:
	src/net/smurtgame/gui/IngamePanel.java