stuff
changes

Conflicts:
	bin/finproject/MapGUI.class