jekyll
Merge branch 'master' of https://github.com/ehrok/ehrok.github.io

Conflicts:
	_posts/2014-06-24-jekyll-ko.md