add stringformat
Merge branch 'master' of https://github.com/Incoding/apiTest

Conflicts:
	src/main/java/com/javaapi/test/String/testString/toolString/StringFormat.java