made some changes

asdf
asdf

asdf
git is bugging
aMerge branch 'master' of https://github.com/XepherX/SMURT

Conflicts:
	bin/net/smurtgame/GUIElement.class
	src/net/smurtgame/GUIElement.java