team

not finished
Merge branch 'master' of https://github.com/reviewninja/marketing

Conflicts:
	_assets/stylesheets/app.css.scss
	index.html