Players can now add goods correctly.
Player can now add food.
Merge branch 'master' into gainingresources
Merge branch 'master' into gainingresources

Conflicts:
	src/models/PlayerResources.java