shinhyung
Merge branch 'master' of https://github.com/KU-HANUL/git_test

Conflicts:
	README.md
shinhyung 2