image changes, header and footer
Merge branch 'josh' into gh-pages

Conflicts:
	NewWebsite/css/main.css