merge
Merge branch 'master' of https://github.com/LostEncoding/JavaEngine

Conflicts:
	2D/bin/Run.class
	2D/bin/source/objects/player/PlayerController.class
Fixed collision bug, add new screen, added player with controls, and added clicking for buttons