Commit.
Merge branch 'home-page'

Conflicts:
	wp-content/themes/cypressand5th/functions.php