organise stuffz, last time i swear
sdfsdf
Merge branch 'master' of git://github.com:9418/TheOnlyError/Platformer

Conflicts:
	src/framework/Window.java
Frame opens