times settings #2
merge
Merge branch 'master' of github.com:seyuf/metroMapping_graphAlgo_java

Conflicts:
	src/algo/graph/Graph.java