本地删除
Merge branch 'master' of https://github.com/fuyi-wang/addison.git

Conflicts:
	addison/src/main/java/com/addison/string/StringTest.java