pages
Merge branch 'master' into blog

Conflicts:
	html/blog.html