added combat

Still buggy and weird, will fix later
Merge branch 'master' of https://github.com/khhle/Stalingrad

Conflicts:
	Assets/Scenes/s1.unity
	Assets/Scripts/moveGrandParent.cs