0
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	_posts/kr/2014-11-28-index.md