Got walls and signs from Dropbox
Merge branch 'master' of https://github.com/navignaw/flashlight

Conflicts:
	Assets/door model.meta
	Assets/door model/DoorsMetalSingle0284_S.jpg.meta
	Assets/door model/Materials.meta
	Assets/door model/Materials/initialShadingGroup.mat.meta
	Assets/door model/door.bmp.meta
	Assets/door model/door.obj.meta
	Assets/door model/door.psd.meta
	Assets/door model/door_d.png.meta
	Assets/flashlight model.meta
	Assets/flashlight model/Materials.meta
	Assets/flashlight model/Materials/initialShadingGroup.mat.meta
	Assets/flashlight model/Various0603_2_S.jpg.meta
	Assets/flashlight model/Various0603_3_S.jpg.meta
	Assets/flashlight model/Various0603_4_S.jpg.meta
	Assets/flashlight model/flashlight.bmp.meta
	Assets/flashlight model/flashlight.mtl.meta
	Assets/flashlight model/flashlight.obj.meta
	Assets/flashlight model/flashlight.png.meta
	Assets/flashlight model/flashlight.psd.meta
	Assets/flashlight model/flashlight_d.png.meta
	Assets/maps/Lights.prefab
	Assets/maps/Materials/concretefloor01d.png.mat
	Assets/maps/Materials/concretewall03a.png.mat
	Assets/maps/Materials/metal02.png.mat
	Assets/maps/unknown.mtl
	Assets/maps/unknown.obj
	Assets/maps/unknown.prefab
	Assets/signs.meta
Syncing
Syncing
Syncing