worked on game
Merge branch 'develop' of https://github.com/Bergmam/DAT255 into develop

Conflicts:
	dat255/src/se/chalmers/dat255/risk/model/Game.java
Merge branch 'develop' of https://github.com/Bergmam/DAT255 into develop