line created on client
Merge remote-tracking branch 'origin/master'

Conflicts:
	GitTest/src/HelloWorld.java