angular directive in coming soon page
Merge conflict with DS_Store
Merge branch 'master' of https://github.com/Zacsi/TiltMarketing
Merge branch 'master' into landing-page