Added myname and Email.
fix conflict
Merge branch 'master' of https://github.com/Dong-Woo/dev.study into Dong-Woo-master

Conflicts:
	README.md
Merge branch 'master' of github.com:it4korea/dev.study