front page css
Merge branch 'master' into cssbackground

Conflicts:
	app/assets/stylesheets/landingpage.css
	app/views/landing/index.html.erb
Merge pull request #125 from eugenefilimonov/cssbackground

Cssbackground
fixed merge conflict