landing done
Merge branch 'develop'

Conflicts:
	app/assets/stylesheets/application.css.sass