GetResources class added (errors)
GetResources class added
Merge branch 'master' into get-resources

Conflicts:
	src/outpost/group3/Player.java
Merge branch 'get-resources'

* get-resources:
  GetResources class added
  GetResources class added (errors)