c
Merge branch 'master' of https://github.com/waan1/waan1.github.com

Conflicts:
	_posts/2013-12-17-main_page.md