Air - commit.
Finally, I know how to use EGit.

Merge branch 'master' of https://github.com/superleo-cn/studygit.git

Conflicts:
	src/HelloWorld.java