hello
aaaaaa
Merge branch 'master' of https://github.com/jjs-0007/git-tutorial

Conflicts:
	sample.txt
	sumple.txt