First Blog Site
Merge branch 'master' into gh-pages

Conflicts:
	_layouts/default.html
ii
i