git demo

Signed-off-by: dijskl <zhouxiaohua@nlsde.buaa.edu.cn>
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	src/com/git/GitDemo.java
third commit

Signed-off-by: dijskl <zhouxiaohua@nlsde.buaa.edu.cn>