add about page
Merge branch 'about' into update

Conflicts:
	layouts/partials/default/masthead.html