Refactored to Java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game.hs
	Person.hs
	Util.hs