Finishes and balances Pock.
Merge branch 'master' into doto

Conflicts:
	battle.py