Show all output
Merge branch 'master' of https://github.com/spywhere/Monopoly

Conflicts:
	src/Player.java
First version complete