settings
Merge branch 'master' of https://github.com/SuperPanda42/SaveTheEarthReturn

Conflicts:
	default/Projects/settings.pyc
Merge branch 'master' of https://github.com/SuperPanda42/SaveTheEarthReturn
QUIIIIIIIZZZZZ