fix
Merge branch 'master' of https://github.com/JokHornsby/Game-Engine

Conflicts:
	Game
Engine.xcodeproj/project.xcworkspace/xcuserdata/JokHornsby.xcuserdatad/U
serInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/JokHornsby/Game-Engine
fix