add hello 11
delete 3 add 11 update 1, 2
Merge branch 'master' of https://github.com/altnhsn/repo1.git

Conflicts:
	project1/src/sample/Hello1.java
	project1/src/sample/Hello2.java
	project1/src/sample/Hello3.java