correted sync fault
Merge Conflicts
Merge branch 'master' into dev

Conflicts:
	assignment1/tika/src/org/apache/tika/parser/tsv/TSVCrawler.java
	assignment1/tika/src/org/apache/tika/parser/tsv/TSVParser.java
Merge New Version