Edited for CS art show.
Merge branch 'newstuff' into dev

Conflicts:
	Assets/Scenes/Level1.unity