Signed-off-by: vivianforzj <zhoujing1990@gmail.com>
Merge branch 'master' of https://github.com/vivianforzj/GitDemo.git

Conflicts:
	src/git/Demo.java