analytics
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Modify CNAME and baseurl
Merge branch 'gh-pages'

Conflicts:
	CNAME
	_config.yml