merge commit
Merge branch 'master' of https://github.com/xTimpi/CS185c-Project

Conflicts:
	Assets/Scenes/level2.unity
level 2 bg music