my first commit

Signed-off-by: kwang eom <kwang.eom@gmail.com>
Merge branch 'master' of https://github.com/kwangeom/testgit

Conflicts:
	hi.txt