add7777
Merge branch 'master' of https://github.com/arpls/newgitdemo.git

Conflicts:
	src/newgitdemo/Test.java