MAJ suite aux remarques de Seb
better booking
Merge pull request #11 from EtienneMangino/booking_optimisation

better booking
Merge branch 'master' into add-user-controller

Conflicts:
	app/views/bookings/_form.html.erb
Merge pull request #10 from EtienneMangino/add-user-controller

MAJ suite aux remarques de Seb
Merge branch 'master' into first-layout

Conflicts:
	app/views/devise/registrations/edit.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/layouts/application.html.erb