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

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

Conflicts:
	DestinyFalls/Source/Game Core/Game.cpp
	DestinyFalls/Source/Game Objects/Player.cpp
	DestinyFalls/Source/Game States/GameplayState.cpp