Add 3rd line by two
Merge branch 'master' of https://github.com/tlin-fei/gitmulti.git

Conflicts:
	HelloWorld/src/Hello.java