oops sur le master
nearly done landing page
landing page done
Merge branch 'design/landing' of github.com:NathanChalot/hoster

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	config/routes.rb