new cave and material
Merge branch 'master' of https://github.com/simubrett/stlgamejam_sept2013

Conflicts:
	Assets/Meshes/New folder.meta
	Assets/Meshes/Rooms/Cavern_Pieces/Cavern_Hallway.fbx.meta
	Assets/Meshes/Rooms/Cavern_Pieces/Corner_Cav01.fbx.meta
	Assets/Meshes/Rooms/Cavern_Pieces/Corner_Cav02.fbx.meta
	Assets/Meshes/Rooms/Cavern_Pieces/Corner_Hall.fbx.meta
	Assets/Meshes/Rooms/txtr.meta
	Assets/Prefabs/Rooms/Cavern.fbx.meta
	Assets/Prefabs/Rooms/Cavern_Hallway.fbx.meta
	Assets/Prefabs/Rooms/Corner_Cav01.fbx.meta
	Assets/Prefabs/Rooms/Corner_Cav02.fbx.meta
	Assets/Prefabs/Rooms/Corner_Hall.fbx.meta
	Assets/Prefabs/Rooms/Materials.meta
	Assets/Prefabs/Rooms/Materials/checkered.mat.meta
	Assets/Prefabs/Rooms/Materials/checkered1.mat.meta
	Assets/Prefabs/Rooms/Materials/checkered2.mat.meta
	Assets/Prefabs/Rooms/Materials/checkered3.mat.meta
	Assets/Prefabs/Rooms/Materials/checkered4.mat.meta
Empty