Update
Merge branch 'master' of https://github.com/pmrenaud/LUAWARS

Conflicts:
	combat.txt