committing before i pull
Merge branch 'master' of
https://github.com/fsteen/monopoly-for-the-gods.git

Conflicts:
	src/edu/brown/cs32/MFTG/mftg/Main.java