Initial commit

Signed-off-by: What name <santaclaws@naver.com>
Merge branch 'master' of github.com:asj2219/myproject

Conflicts:
	hi.txt