solving conflict
Merge branch 'master' of https://github.com/xjtujack/Durham314.git

Conflicts:
	src/main/Main.java
	src/main/Paths.java