Finished setup
Setup edits
Finished halving resources on seven
Small edit
Game winning done
Merge, updated GameRunner, and updated setupPanel

NOTE: setupPanel now has bug. Please check.
Merge branch 'master' of https://bitbucket.org/cressel/catan
Conflicts:
	src/game/Player.java
	src/gui/SideBar.java