Kim 07/30
Merge branch 'design' of https://github.com/leejesslee/RAV_SOMMAR2014 into design
Aron 30/07
Merge branch 'design' of https://github.com/leejesslee/RAV_SOMMAR2014 into design
Kim tidig morgon :D
Merge branch 'design' of https://github.com/leejesslee/RAV_SOMMAR2014 into design

Conflicts:
	Assets/Materials/tex_mod3_del1.mat
Aron förmiddag 31/07
Merge branch 'design' of https://github.com/leejesslee/RAV_SOMMAR2014 into design

Conflicts:
	Assets/Standard Assets.meta
Merge branch 'master' into design

Conflicts:
	Assets/0 Animations/Boy/Clothes/Materials.meta
	Assets/4 Texturer/Materials/dirt_UV_DIF.mat
	Assets/4 Texturer/Materials/dirt_UV_DIF.mat.meta
	Assets/4 Texturer/Materials/dirt_UV_DIF_OCC.mat
	Assets/4 Texturer/Materials/dirt_UV_DIF_OCC.mat.meta
	Assets/4 Texturer/Materials/dirt_UV_DIF_SPEC.mat
	Assets/4 Texturer/Materials/dirt_UV_DIF_SPEC.mat.meta
	Assets/4 Texturer/Materials/tex_mod3_del7.mat
	Assets/4 Texturer/Materials/tex_mod3_del7.mat.meta
	Assets/4 Texturer/Texture.meta
	Assets/4 Texturer/Texture/dirt_UV_DIF.png
	Assets/4 Texturer/Texture/dirt_UV_DIF.png.meta
	Assets/4 Texturer/Texture/dirt_UV_DIF_OCC.png
	Assets/4 Texturer/Texture/dirt_UV_DIF_OCC.png.meta
	Assets/4 Texturer/Texture/dirt_UV_DIF_SPEC.png
	Assets/4 Texturer/Texture/dirt_UV_DIF_SPEC.png.meta
	Assets/4 Texturer/Texture/sand_DIF(1).png
	Assets/4 Texturer/Texture/sand_DIF(1).png.meta
	Assets/Materials/Tex_Diff_Skydome_blueversion.mat
	Assets/Materials/Tex_Diff_Skydome_blueversion.mat.meta
	Assets/Materials/tex_bridge.mat.meta
	Assets/Materials/tex_mod3_del7.mat
	Assets/Materials/tex_mod3_del7.mat.meta
	Assets/Meshes/Environment.meta
	Assets/Prefabs Blockout/RockBlobs/Materials.meta
	Assets/Standard Assets.meta
	Assets/Texture.meta
	Assets/Texture/Materials.meta
	Assets/Texture/Materials/dirt_UV_DIF.mat
	Assets/Texture/Materials/dirt_UV_DIF.mat.meta
	Assets/Texture/Materials/dirt_UV_DIF_OCC.mat
	Assets/Texture/Materials/dirt_UV_DIF_OCC.mat.meta
	Assets/Texture/Materials/dirt_UV_DIF_SPEC.mat
	Assets/Texture/Materials/dirt_UV_DIF_SPEC.mat.meta
	Assets/Texture/dirt_UV_DIF.png
	Assets/Texture/dirt_UV_DIF.png.meta
	Assets/Texture/dirt_UV_DIF_OCC.png
	Assets/Texture/dirt_UV_DIF_OCC.png.meta
	Assets/Texture/dirt_UV_DIF_SPEC.png
	Assets/Texture/dirt_UV_DIF_SPEC.png.meta
	Assets/Texture/sand_DIF(1).png.meta
	Assets/Textures/Environment/Materials/dirt_UV_DIF.mat
	Assets/Textures/Environment/Materials/dirt_UV_DIF.mat.meta
	Assets/Textures/Environment/Materials/dirt_UV_DIF_OCC.mat
	Assets/Textures/Environment/Materials/dirt_UV_DIF_OCC.mat.meta
	Assets/Textures/Environment/Materials/dirt_UV_DIF_SPEC.mat
	Assets/Textures/Environment/Materials/dirt_UV_DIF_SPEC.mat.meta
	Assets/Textures/Environment/Rock-Texture-Surface.jpg.meta
	Assets/Textures/Environment/dirt_UV_DIF.png
	Assets/Textures/Environment/dirt_UV_DIF.png.meta
	Assets/Textures/Environment/dirt_UV_DIF_OCC.png
	Assets/Textures/Environment/dirt_UV_DIF_OCC.png.meta
	Assets/Textures/Environment/dirt_UV_DIF_SPEC.png
	Assets/Textures/Environment/dirt_UV_DIF_SPEC.png.meta
	Assets/Textures/Exterior/temp_WoodPlanks.jpg.meta
Kim förmiddag igen 31/7
Merge branch 'design' of https://github.com/leejesslee/RAV_SOMMAR2014 into design
projekt fix -- Lex
Merge branch 'design' of https://github.com/leejesslee/RAV_SOMMAR2014 into design
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
Merge branch 'master' into design

Conflicts:
	Assets/SpaceShip.unity
	Assets/Standard Assets.meta
	Assets/Terrain/July_terrain.asset
	Assets/Terrain/Juni_Terrain.asset
	Assets/Terrain/New Terrain 4.asset