Changed movement, added shooting
Clean up
Merge branch 'master' into topdown

Conflicts:
	Assets/Blood Decals Mesh.asset.meta
	Assets/Materials/Blood Splat.mat.meta
	Assets/Materials/Bullet Hole.mat.meta
	Assets/Materials/DockedShipCloak.mat.meta
	Assets/Plugins/Decal System/Documentation.meta
	Assets/Plugins/Decal System/Documentation/DecalSystemAPI.zip.meta
	Assets/Plugins/Decal System/Documentation/Reference.pdf.meta
	Assets/Plugins/Decal System/Scripts.meta
	Assets/Plugins/Decal System/Scripts/Decals.meta
	Assets/Plugins/Decal System/Scripts/Decals/Decals.meta
	Assets/Plugins/Decal System/Scripts/Decals/Decals/DS_DecalProjector.cs.meta
	Assets/Plugins/Decal System/Scripts/Decals/Decals/DS_DecalProjectorGroup.cs.meta
	Assets/Plugins/Decal System/Scripts/Decals/Decals/Renderer/DS_DecalsMeshRenderer.cs.meta
	Assets/Plugins/Decal System/Scripts/Decals/SkinnedDecals/DS_SkinnedDecalProjector.cs.meta
	Assets/Prefabs/Raptor Prefabs/Upgrades/Attack Upgrade.prefab
	Assets/Prefabs/Raptor Prefabs/Upgrades/Health Upgrade.prefab
	Assets/Prefabs/Raptor Prefabs/Upgrades/Stealth Upgrade.prefab
	Assets/Scenes/BuyMenu.unity.meta
	Assets/Scenes/shadertest.unity.meta
	Assets/Scenes/shiptest.unity
	Assets/Scripts/Post/ScreenSpaceReflections.cs.meta
	Assets/Scripts/Raptor Scripts/Enemy.cs
	Assets/Scripts/Raptor Scripts/Enemy.cs.meta
	Assets/Scripts/Shaders/ScreenSpaceReflections.shader.meta
Added police ships
derp
don't merge me
Rudimentary background
Merge remote-tracking branch 'Raptor/topdown' into ericsworkingbranch

Conflicts:
	Assets/Scripts/Raptor Scripts/Enemy.cs
	ProjectSettings/TagManager.asset