Merge branch 'master' of https://github.com/junyawang/SalesTap

Conflicts:
css/custom.css
img/banner_bg.jpg
img/banner_hero.jpg
img/bottom_cta_bg.svg
img/favicon.ico
img/icon_check.png
img/mid_cta_bg.svg
img/salesTap_logo_dark.png
index.html
fix conflict