Revert "Revert "max wars""

This reverts commit 41f424d915e61e6dec1e70f5323b65ec4b63c13e.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Blup.txt