work in progress
upd
upd
upd
upd
first turn fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/prefabs/AI Blade_Warrior_T05_All 1.prefab
	Assets/prefabs/Classes/BattleMage.prefab
	Assets/prefabs/Classes/Knigth.prefab
	Assets/prefabs/Classes/Priest.prefab
	Assets/prefabs/Classes/Squire.prefab
	Assets/scenes/gameScene.unity
	Assets/scripts/GameManager.cs
	Assets/scripts/Units/Unit.cs