made separate pages for nag bar and footer
conflict

Conflicts:
	2014.html
	folio.html