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

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

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

Conflicts:
	DestinyFalls/Source/Game States/PauseMenuState.cpp
asdf