Added Kim jinyoung
fix conflict
Merge branch 'master' of https://github.com/jingood2/dev.study into jingood2-master

Conflicts:
	README.md