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

Conflicts:
	DestinyFalls/Source/Game States/GameplayState.cpp
blah
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls

Conflicts:
	DestinyFalls/Options.txt
	DestinyFalls/Source/Game States/CombatState.cpp
	DestinyFalls/Source/Game States/InventoryState.cpp
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls

Conflicts:
	DestinyFalls/Source/Game Objects/Player.cpp
	DestinyFalls/Source/Game States/CreditState.cpp
Particle Manager fixed
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls