cttttttt
Merge branch 'master' of https://github.com/huangsizhou/gitone.git

Conflicts:
	gitone/src/com/example/Test.java