Merge branch 'Test01'

Conflicts:
	test1/src/com/git/test/Test1.java
111
Merge branch 'master' of https://github.com/henryhjq/giteclipse.git