Notes!
Merge branch 'master' into lwjgl

Conflicts:
	src/me/mbl/held/game/Game.java
Changed formatter to be more... Cool! :p

Don't forget to update in eclipse!
Merge commit '84cff1a2512280dd9f6d4127b933210950390f68' into lwjgl