all new
removed html in root
fixed default.html
Merge branch 'pages'

Conflicts:
	3d.html