Deleted unused shite
Merge branch 'master' of https://github.com/Emmsii/Planet-Trading-Game

Conflicts:
	src/com/gpg/planettrade/clientbutts/gui/Button.java
	src/com/gpg/planettrade/clientbutts/gui/FontRenderer.java
	src/com/gpg/planettrade/clientbutts/states/ConnectionState.java
	src/com/gpg/planettrade/clientnew/Client.java
	src/com/gpg/planettrade/clientnew/States.java
	src/com/gpg/planettrade/clientnew/gui/FontRenderer.java
	src/com/gpg/planettrade/clientnew/gui/GUIElement.java
	src/com/gpg/planettrade/clientnew/states/ConnectionState.java
	src/com/gpg/planettrade/clientnew/states/MainMenuState.java
	src/com/gpg/planettrade/clientnew/states/State.java
	src/com/gpg/planettrade/clientnew/states/StateInterface.java
	src/com/gpg/planettrade/clientnew/util/Magicalness.java
-_-