merger?
Merge branch 'master' of https://github.com/Velro/Aegis

Conflicts:
	Aegis/Assets/Art/Models/Corsair/corsair_mesh.mtl.meta
	Aegis/Assets/Art/Models/Enemies.meta
	Aegis/Assets/Art/Models/Enemies/Corsair.meta
	Aegis/Assets/Art/Models/Enemies/Corsair/Materials.meta
	Aegis/Assets/Art/Models/Enemies/Corsair/Materials/initialShadingGroup.mat
	Aegis/Assets/Art/Models/Enemies/Corsair/Materials/initialShadingGroup.mat.meta
	Aegis/Assets/Art/Models/Enemies/Corsair/corsair_diff.tga
	Aegis/Assets/Art/Models/Enemies/Corsair/corsair_diff.tga.meta
	Aegis/Assets/Art/Models/Enemies/Corsair/corsair_mesh.mtl
	Aegis/Assets/Art/Models/Enemies/Corsair/corsair_mesh.mtl.meta
	Aegis/Assets/Art/Models/Enemies/Corsair/corsair_mesh.obj
	Aegis/Assets/Art/Models/Enemies/Corsair/corsair_mesh.obj.meta
	Aegis/Assets/Art/Models/Enemies/Quickjet/Materials.meta
	Aegis/Assets/Art/Models/Enemies/Quickjet/Materials/polySurface11Mat.mat
	Aegis/Assets/Art/Models/Enemies/Quickjet/Materials/polySurface11Mat.mat.meta
	Aegis/Assets/Art/Models/Enemies/Quickjet/quickjet_diff.tga
	Aegis/Assets/Art/Models/Enemies/Quickjet/quickjet_diff.tga.meta
	Aegis/Assets/Art/Models/Enemies/Quickjet/quickjet_diff2.tga
	Aegis/Assets/Art/Models/Enemies/Quickjet/quickjet_diff2.tga.meta
	Aegis/Assets/Art/Models/Enemies/Quickjet/quickjet_mesh.obj
	Aegis/Assets/Art/Models/Enemies/Quickjet/quickjet_mesh.obj.meta
	Aegis/Assets/Art/Models/Enemies/Rammer/Materials.meta
	Aegis/Assets/Art/Models/Enemies/Rammer/Materials/rammerMat.mat
	Aegis/Assets/Art/Models/Enemies/Rammer/Materials/rammerMat.mat.meta
	Aegis/Assets/Art/Models/Enemies/Rammer/Materials/rammer_diff.mat
	Aegis/Assets/Art/Models/Enemies/Rammer/Materials/rammer_diff.mat.meta
	Aegis/Assets/Art/Models/Enemies/Rammer/rammer_mesh.obj.meta
	Aegis/Assets/Art/Models/Enemies/Space Worm.meta
	Aegis/Assets/Art/Models/Enemies/Space Worm/Materials.meta
	Aegis/Assets/Art/Models/Enemies/Space Worm/Materials/mouth4paint_uvd_initialShadingGroup1.mat
	Aegis/Assets/Art/Models/Enemies/Space Worm/spaceworm_head_diff.tga.meta
	Aegis/Assets/Art/Models/Enemies/Space Worm/spaceworm_head_mat.mat.meta
	Aegis/Assets/Art/Models/Enemies/Space Worm/spaceworm_head_mesh.fbx
	Aegis/Assets/Art/Models/Enemies/Space Worm/spaceworm_head_mesh.fbx.meta
	Aegis/Assets/Art/Models/Enemies/Turret 1.meta
	Aegis/Assets/Art/Models/Enemies/Turret 1/Materials.meta
	Aegis/Assets/Art/Models/Enemies/Turret 1/Materials/polySurface1Mat.mat
	Aegis/Assets/Art/Models/Enemies/Turret 1/Materials/polySurface1Mat.mat.meta
	Aegis/Assets/Art/Models/Enemies/Turret 1/Materials/polySurface2Mat.mat
	Aegis/Assets/Art/Models/Enemies/Turret 1/Materials/polySurface2Mat.mat.meta
	Aegis/Assets/Art/Models/Enemies/Turret 1/turret_base.obj
	Aegis/Assets/Art/Models/Enemies/Turret 1/turret_base.obj.meta
	Aegis/Assets/Art/Models/Enemies/Turret 1/turret_base_diff.tga
	Aegis/Assets/Art/Models/Enemies/Turret 1/turret_base_diff.tga.meta
	Aegis/Assets/Art/Models/Enemies/Turret 1/turret_base_mat.mat
	Aegis/Assets/Art/Models/Enemies/Turret 1/turret_base_mat.mat.meta
	Aegis/Assets/Art/Models/Enemies/Turret 1/turret_gun.obj
	Aegis/Assets/Art/Models/Enemies/Turret 1/turret_gun.obj.meta
	Aegis/Assets/Art/Models/Enemies/Turret 1/turret_gun_diff.tga
	Aegis/Assets/Art/Models/Enemies/Turret 1/turret_gun_diff.tga.meta
	Aegis/Assets/Art/Models/Enemies/Turret 1/turret_gun_mat.mat
	Aegis/Assets/Art/Models/Enemies/Turret 1/turret_gun_mat.mat.meta
	Aegis/Assets/Art/Models/Enemies/Viper/viper_diff.tga
	Aegis/Assets/Art/Models/Enemies/Viper/viper_mesh.obj
	Aegis/Assets/Art/Models/Enemies/Viper/viper_mesh.obj.meta
	Aegis/Assets/Art/Props and Environment/Surface/Materials/oomdassaTerrain1Mat.mat
	Aegis/Assets/Art/Props and Environment/Surface/Materials/oomdassa_cloudplane_diff_1.mat
	Aegis/Assets/Art/Props and Environment/Surface/Materials/oomdassa_terrain_diff.mat
	Aegis/Assets/Levels/SurfaceLevel.unity.meta