Merge branch 'gh-pages'
reconciling
updates
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml
	_posts/2011-03-10-sample-post.md
	_posts/2013-08-16-code-highlighting-post.md
	_site/README.md
	_site/index.html
	cname
	theme-setup.md