changed format of layout slightly
"Merged deletion of page1 and page2 links"

Conflicts:
	templates/layout.html