Merge remote-tracking branch 'origin/master'

Conflicts:
	CNAME
	Gemfile
	_config.yml
	_includes/footer.html
	_includes/head.html
	about.md
	index.md
Merge remote-tracking branch 'origin/master'