removes landing page
Merge branch 'master' into develop

Conflicts:
	app/assets/stylesheets/pages/landing.css.scss
updates develop branch
css updates
updating landing page
adds new landing page bg image