changed some scene stuff.
Merge remote-tracking branch 'origin/nick-dev-branch' into Mike-Branch

Conflicts:
	Assets/Scenes/Main.unity