commit11
commit 12
merge 20
Merge remote-tracking branch 'origin/master'

Conflicts:
	새 텍스트 문서.txt