just to make this work
Merge remote-tracking branch 'origin/master'

Conflicts:
	ARNA/bin/classes/edu/ycp/cs481/arna/client/ui/CompassModeView.class
	ARNA/bin/classes/edu/ycp/cs481/arna/client/ui/TourModeView.class
	ARNA/bin/classes/edu/ycp/cs481/arna/shared/model/TourMode.class
	ARNA/src/edu/ycp/cs481/arna/shared/model/TourMode.java