Merge branch 'master' of github.com:kykuo/kykuo.github.io

Conflicts:
	.gitignore
	404.html
	README.md
	_config.yml
	_layouts/default.html