add new line by local
Merge branch 'master' of https://github.com/arpls/fromgit.git

Conflicts:
	src/fromgit/Test1.java