Starting new level
Merge branch 'master' of https://github.com/DarkOmega/VRJam2014

Conflicts:
	VRJam2014/Assets/Art/Coin.mtl.meta
	VRJam2014/Assets/Art/Coin.obj.meta
	VRJam2014/Assets/Art/Cube-columns.mtl.meta
	VRJam2014/Assets/Art/Cube-columns.obj.meta
	VRJam2014/Assets/Art/Cube-solid.mtl.meta
	VRJam2014/Assets/Art/Cube-solid.obj.meta
	VRJam2014/Assets/Art/Dome-1.mtl.meta
	VRJam2014/Assets/Art/Dome-1.obj.meta
	VRJam2014/Assets/Art/Everything.mb.meta
	VRJam2014/Assets/Art/Fence.mtl.meta
	VRJam2014/Assets/Art/Fence.obj.meta
	VRJam2014/Assets/Art/Materials.meta
	VRJam2014/Assets/Art/Materials/initialShadingGroup.mat
	VRJam2014/Assets/Art/Materials/initialShadingGroup.mat.meta
	VRJam2014/Assets/Art/Ring-big.mtl.meta
	VRJam2014/Assets/Art/Ring-big.obj.meta
	VRJam2014/Assets/Art/Ring-small.mtl.meta
	VRJam2014/Assets/Art/Ring-small.obj.meta
	VRJam2014/Assets/Art/Tower-1x2.mtl.meta
	VRJam2014/Assets/Art/Tower-1x2.obj.meta
	VRJam2014/Assets/Art/Tower-1x3.mtl.meta
	VRJam2014/Assets/Art/Tower-1x3.obj.meta
Merge branch 'master' of https://github.com/DarkOmega/VRJam2014