Merge remote-tracking branch 'origin/master'

Conflicts:
	_layouts/default.html
	_layouts/post.html
	archives.html
	css.css
	index.html