update .gitignore
common commit

Conflicts:
	java/src/name/zhangmin/java/io/FileUtils.java
add stringToInt function