4th commit
Merge branch 'master' of https://github.com/bangucs/Examine

Conflicts:
	workspace/test/src/com/bangucs/util/TrigramTest.java