Merge branch 'master' of https://github.com/zhangBenson/Algorithms

Conflicts:
	Test/src/test1/Index.java
	Test/src/test1/IndexMap.java
	Test/src/test1/ObjectUtil.java