Master is now up to date and working properly
fixed icon
Merge remote-tracking branch 'origin/master' into katelyn

Conflicts:
	OriginalOrigins.git/branches/ProjectSettings/ProjectSettings.asset