edited setup state stuff

edited setup state stuff
fixed conflict

Conflicts:
	Catan/java/src/shared/states/Playing.java