worked on gui layout
Merge branch 'master' of https://github.com/fsteen/monopoly-for-the-gods.git

Conflicts:
	bin/edu/brown/cs32/MFTG/tournament/TournamentNotes
	src/edu/brown/cs32/MFTG/gui/MonopolyGui.java
	src/edu/brown/cs32/MFTG/tournament/Client.java
	src/edu/brown/cs32/MFTG/tournament/ClientTests.java