Commit for pull
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls
Fixed Player animation...again
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls

Conflicts:
	DestinyFalls/Source/Game Objects/Player.cpp
Final fixing of the combat animation