Combine marketing and product homepage
Created by: slimsag
from sourcegraph/sourcegraph-intermediate-2018@0df1ccd
fixes https://github.com/sourcegraph/enterprise/issues/13480
cc @francisschmaltz this is your new branch :)
This PR updates the CHANGELOG.md file to describe any user-facing changes. This PR does not need to update the CHANGELOG because ...