dead and attack
Merge branch 'master' of https://github.com/HuvaaKoodia/FGJ2014

Conflicts:
	Assets/Scenes/SceneTest.unity
	Assets/UnitMain.cs