Begun work on stage/scene (first) level
merge
removed drums
Merge branch 'master' of https://github.com/johntu/RockstarSimulator
Begun work on stage/scene (first) level
Merge remote-tracking branch 'origin/master' into temp

Conflicts:
	Assets/Prefabs/PlayerAndCamera.prefab
	Assets/Prefabs/PlayerAndCamera.prefab.meta
Merge branch 'master' into temp