Epic battle
Merge branch 'master' of https://github.com/ziccidus/unity-friday

Conflicts:
	Assets/Scenes/Level1.unity
	Assets/Scripts/Shield.cs