packages
Made test main and updated development tests.
Merge branch 'master' into developments
Merge branch 'master' into gainingresources

Conflicts:
	src/models/PlayerResources.java