Merge branch 'HW2' of ssh://git@github.com/spk83/risk.git into HW2

Conflicts:
	src/org/risk/client/Territory.java