pages
Merge branch 'master' into home

Conflicts:
	html/index.html