commit for pull
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls

Conflicts:
	DestinyFalls/Source/Game States/CombatState.cpp
	DestinyFalls/resource/XML/Options.txt
a;lskdfjd;asdjkl
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls