add email
conflict 수정하고 merge 합니다.
Merge branch 'master' of https://github.com/hjazz/dev.study into hjazz-master

Conflicts:
	README.md