Update default.html
Merge branch 'master' into done

Conflicts:
	_layouts/default.html