a
Merge branch 'master' of https://github.com/leejessica/crawler

Conflicts:
	src/main/java/mo/umac/crawler/offline/BinaryCrawler.java