Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/finproject/MovingMap.class
	bin/finproject/Village$AdjList.class
	bin/finproject/Village.class

sdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/finproject/MovingMap.class
	bin/finproject/Village$AdjList.class
	bin/finproject/Village.class