Fuck Me
Merge branch 'master' of https://github.com/david-ahern/NoEndHouse

Conflicts:
	Assets/Imports/Materials/Material.mat
	Assets/Materials/Blur.mat.meta
	Assets/Materials/FontMaterial 1.mat
	Assets/Materials/FontMaterial.mat
	Assets/Materials/TestMaterials/FlatColorShader.mat
	Assets/Materials/TestMaterials/NormalMapsDiffuse.mat
	Assets/Materials/TestMaterials/NormalMapsSpecular.mat
	Assets/Materials/TestMaterials/SpecularFragmentMaterial.mat
	Assets/Materials/TestMaterials/SpecularVertexMaterial.mat
	Assets/Materials/TestMaterials/Texture.mat
	Assets/Prefabs/Areas/FrontArea.prefab
	Assets/Prefabs/Door.prefab
	Assets/Prefabs/Mirror.prefab
	Assets/Prefabs/TestObj.prefab
	Assets/Prefabs/Text.prefab
	Assets/Prefabs/Window.prefab