typed 1 ...
typed 2 ...
Merge branch 'master' of https://github.com/seungchanlee/Hello-World

Conflicts:
	abc.txt