commit locally
Merge branch 'master' of https://github.com/altnhsn/repo1.git

Conflicts:
	project1/src/sample/Hello2.java