Merge remote-tracking branch 'hyde/master'

Conflicts:
	.gitignore
	CNAME
	README.md
	_config.yml
	_layouts/default.html
	_layouts/post.html
	atom.xml
	index.html