save 31/03 2
Merge branch 'master' of github.com:StaubOliver/ProjetWeb
Merge branch 'master' of github.com:StaubOliver/ProjetWeb
Merge branch 'master' of github.com:StaubOliver/ProjetWeb
save 07/04
a
Merge branch 'master' of github.com:StaubOliver/ProjetWeb
before admin
before admin 2
Merge branch 'master' of github.com:StaubOliver/ProjetWeb

Conflicts:
	db/schema.rb
autorisation
autorisation 10/04
Merge branch 'master' of github.com:StaubOliver/ProjetWeb