Merge branch 'bmesh_prod' of gitlab-928elcd01.blackmesh.com:vt-timberworks/vermonttimberworks-com into bmesh_prod

Conflicts:
	wp-content/themes/vermonttimberworks/acf-json/group_5563739a24174.json
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch bmesh_prod
# Your branch is ahead of 'origin/bmesh_prod' by 1 commit.
#   (use "git push" to publish your local commits)
#
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   wp-content/themes/vermonttimberworks/acf-json/group_5563739a24174.json
#	modified:   wp-content/themes/vermonttimberworks/page-home.php
#	modified:   wp-content/themes/vermonttimberworks/sass/components/_header_banner.scss
#	modified:   wp-content/themes/vermonttimberworks/stylesheets/style.css
#