before fetching upstream
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	wp-content/themes/mfadt14/footer.php
before-hero
before-hero
before-hero
Merge remote-tracking branch 'upstream/develop' into develop
merge upstream
static hero
static hero
Merge branch 'develop-hero' into develop
Merge branch 'palaa159-develop' into develop

Merging in Apon's static header