Updated the Player and the Main classes along with others.
Merge branch 'master' of https://github.com/IpodHero188/Projects

Conflicts:
	City_Saver/City_Saver/City_SaverContent/City_SaverContent.contentproj