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

Conflicts:
	DestinyFalls/Source/Game States/CombatState.cpp
wertyuio
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls
zxcvbnm,.qwertyuiop[
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls

Conflicts:
	DestinyFalls/resource/XML/Options.txt
qawsedrftgyhujikolp
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls

Conflicts:
	DestinyFalls/Source/Game Core/Game.cpp
	DestinyFalls/Source/Game States/GameplayState.cpp
	DestinyFalls/Source/Game States/PauseMenuState.cpp
	DestinyFalls/resource/XML/Options.txt
azqwsxedcrfvtgyhbunjmik,ol
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls

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

Conflicts:
	DestinyFalls/Source/Game States/GameplayState.cpp
	DestinyFalls/resource/XML/Options.txt
asdfgdhjkh
Merge branch 'master' of https://github.com/Poofyfancypants/Destiny-Falls