x
Merge branch 'master' of github.com:cbccool/cbccool.github.io

Conflicts:
	_config.yml
	_site/404.html
	_site/atom.xml
	_site/wiki.html