Lots of fixes
Merge branch 'master' of https://github.com/HazardousPeach/AlienMuseumGame

Conflicts:
	AlienMuseumWindows/AlienMuseumWindows/Entity/Player.cs
	AlienMuseumWindows/AlienMuseumWindows/Game1.cs