Merge branch 'gh-pages' of https://github.com/nationalparkservice/responsive-redesign into gh-pages

Conflicts:
	assets/css/leftNav.css
	assets/css/matt.css
	index.htm