set up for local
pages for no circ sub sec
Merge remote-tracking branch 'remotes/github/nocircs'

Conflicts:
	templates/header.php