TP local
Merge branch 'master' of https://github.com/xz565/TestingProject

Conflicts:
	src/lcoj/string/StringToInteger.java