added the choose how many armies to move after capturing a territory ability
move after capture
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	risk/battle.py
	risk/player/player.py
Merge remote-tracking branch 'refs/remotes/upstream/master'
I dun goofed. the move_after_attack function didn't get commited last time somehow so here it is again
Merge pull request #35 from B-Lock/master

added move armies after capturing a territory ability