damage rework
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/scripts/GameManager.cs
Merge branch 'master' of https://github.com/soulnai/tactics

Conflicts:
	Assets/scenes/gameScene.unity