Landing page
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/app.scss
	client/components/navbar/navbar.controller.js
	client/index.html