more
Merge branch 'master' of https://github.com/huguogang/Algorithms.git

Conflicts:
	src/name/huguogang/Algorithms/StringAlgo.java
	src/test/name/huguogang/Algorithms/StringAlgoTest.java