soldier moves the robber and robs
Merge branch 'master' of https://github.com/abe-austin/Catan
fixed the slight changes between me and abe
Conflicts:
	java/src/client/map/MapController.java
	java/src/controller/ControllerFacade.java