12/17 fixed annoying float bugs, working on gstates
12/17 fixed annoying float bugs, working on gstates
Conflicts:
	cpp/JM_BaseStateMachine.cpp
	cpp/JM_BulletFactory.cpp
	cpp/JM_CollisionCircle.cpp
	cpp/JM_CollisionSystem.cpp
	cpp/JM_DamageComponent.cpp
	cpp/JM_EnemyFactory.cpp
	cpp/JM_Entity.cpp
	cpp/JM_HealthComponent.cpp
	cpp/JM_HealthSystem.cpp
	cpp/JM_InputComponent.cpp
	cpp/JM_MainMenuState.cpp
	cpp/JM_PlayerPositionComponent.cpp
	cpp/JM_PlayingState.cpp
	cpp/JM_PositionComponent.cpp
	cpp/JM_PositionSystem.cpp
	cpp/JM_RenderComponent.cpp
	cpp/JM_RenderingSystem.cpp
	cpp/JM_Utilities.cpp
	cpp/JM_World.cpp
	cpp/main.cpp
	h/JM_BaseStateMachine.h
	h/JM_BulletFactory.h
	h/JM_CollisionCircle.h
	h/JM_CollisionSystem.h
	h/JM_DamageComponent.h
	h/JM_DamageSystem.h
	h/JM_EnemyFactory.h
	h/JM_Entity.h
	h/JM_Event.h
	h/JM_EventFunctions.h
	h/JM_HealthComponent.h
	h/JM_HealthSystem.h
	h/JM_InputComponent.h
	h/JM_PlayerPositionComponent.h
	h/JM_PlayingState.h
	h/JM_PositionComponent.h
	h/JM_RenderingSystem.h
	h/JM_Utilities.h
	h/JM_World.h