uh oh
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls

Conflicts:
	DestinyFalls/Source/Game Objects/Player.cpp
	DestinyFalls/Source/Game States/CombatState.cpp
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls
fix