mal upd
mal eclipse upd
Merge branch 'master' of https://github.com/maliang079/GitDemo.git

Conflicts:
	src/com/cn/gitdemo/TestGit.java