second line added.
Merge branch 'master' of https://github.com/kim2509/test

Conflicts:
	test2.txt
merged.