add modify branch1
commit from project-git
commit from project-git
Merge branch 'master' of https://github.com/mzhang-coupang/prjgit1.git

Conflicts:
	src/my/MyMain.java