dedup
Merge branch 'master' of github.com:zichuanwang/csci572
corrected json encoding
test
Merge branch 'master' of https://github.com/zichuanwang/csci572
sss
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