Add the collider stairs to the main scene
Merge branch 'master' of https://github.com/Anixen/VirtualJam2014_11_21

Conflicts:
	Assets/LightShafts/README.md.meta