More Fixes
Merge branch 'master' of https://github.com/HazardousPeach/AlienMuseumGame

Conflicts:
	AlienMuseumWindows/AlienMuseumWindows/Entity/Player.cs
	AlienMuseumWindows/AlienMuseumWindows/States/PlayState.cs
Merge branch 'master' of https://github.com/HazardousPeach/AlienMuseumGame