커밋메세지 입력
추가함
Merge branch 'master' of https://github.com/iziz/gitTour
Merge branch 'mywork' of https://github.com/iziz/gitTour

Conflicts:
	olololol
Merge branch 'master' of https://github.com/iziz/gitTour

Conflicts:
	olololol