added shields
file cleanup
Merge branch 'master' of https://github.com/JeffreyMJohnson/invaders

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/_scenes/MainGameScene.unity
	Assets/animation_controllers/enemy_shot.controller
	Assets/animation_controllers/enemy_shot.controller.meta
	Assets/animation_controllers/enemy_shot_2.controller
	Assets/animation_controllers/enemy_shot_2.controller.meta
	Assets/animation_controllers/player.controller
	Assets/animation_controllers/player.controller.meta
	Assets/animation_controllers/shield.controller.meta
	Assets/animations/enemy_shot_a.anim
	Assets/animations/enemy_shot_b.anim
	Assets/pre fabs/enemy1.prefab
	Assets/pre fabs/ground.prefab
	Assets/pre fabs/shot.prefab
	Assets/scripts/Enemy.cs
	Assets/scripts/EnemyController.cs
	Assets/scripts/EnemyShot.cs.meta
	Assets/scripts/camera.cs
	Assets/scripts/player.cs
	Assets/sprite sheets/player.png.meta
	ProjectSettings/TagManager.asset
	invaders-csharp.sln
	invaders.sln
	invaders.userprefs
	invaders.v12.suo