Added Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/com/guide/city/crawler/CrawlingTest.java