blog dele
Merge branch 'gh-pages' of https://github.com/xpi/blog into gh-pages

Conflicts:
	_config.yml