commit map changes
Merge branch 'master' into section-contact

Conflicts:
	_includes/contact.html