forget what i changed ... but it wasnt much
Merge branch 'master' of https://github.com/fsteen/monopoly-for-the-gods.git
wrote data processing methods for the tournament (hopefully they are
also quite applicable to the client)
some tiny changes
Merge branch 'master' of
https://github.com/fsteen/monopoly-for-the-gods.git

Conflicts:
	src/edu/brown/cs32/MFTG/networking/ClientHandler.java
	src/edu/brown/cs32/MFTG/tournament/Tournament.java