Kim yeeaa
Merge branch 'design' of https://github.com/leejesslee/RAV_SOMMAR2014 into design

Conflicts:
	Assets/4 Texturer/Materials/defaultMat.mat
	Assets/4 Texturer/Texture/Butterfly_2.png.meta
	Assets/4 Texturer/Texture/cubemap5.png.meta
	Assets/4 Texturer/Texture/dirt_UV_DIF.png.meta
	Assets/4 Texturer/Texture/dirt_UV_DIF_OCC.png.meta
	Assets/4 Texturer/Texture/dirt_UV_DIF_SPEC.png.meta
	Assets/4 Texturer/Texture/roof_tile1_SPEC.png.meta
	Assets/4 Texturer/Texture/sand_DIF(1).png.meta
	Assets/4 Texturer/Texture/screentitle.png.meta
	Assets/4 Texturer/Texture/tex_dekal_2.png.meta
	Assets/Placeholders/Kamera/Plugins.meta
	Assets/Placeholders/Kamera/_Scripts.meta
	Assets/SpaceShip.unity
	Assets/TestSheet.png.meta
	Assets/Textures/Environment/cubemap5.png.meta
	Assets/Textures/Exterior/Materials/dirt_UV_DIF.mat.meta
	Assets/Textures/Exterior/Materials/dirt_UV_DIF_OCC.mat.meta
	Assets/Textures/Exterior/Materials/dirt_UV_DIF_SPEC.mat.meta
	Assets/_Prefabs/Materials.meta
	Assets/_Prefabs/Materials/defaultMat.mat.meta