Revert "merging with old"

This reverts commit 40bd5ed7f554f335339924f85f794a53aafd5b93.

Conflicts:
	src/net/foxgenesis/slimesoccer/ui/MainMenu.java
	src/net/foxgenesis/slimesoccer/ui/SoccerGame.java
	src/net/foxgenesis/slimesoccer/ui/component/Button.java