연우: 리드미 고쳤어
충돌제거
Merge branch 'master' of https://github.com/jaeronge/jaeronge.github.com

Conflicts:
	README.md