colors for army and unit names
removed damage from attackresult
Merge remote-tracking branch 'origin/master'

Conflicts:
	autofight.hs