a e
b onE
c onE
Merge branch 'master' of https://github.com/songdukpark3/test

Conflicts:
	A.txt