Recherche Noms
commit avant creation branche florent
modif model user
fin gestion basique user
Merge pull request #1 from IPunchu/gestionuser

Gestionuser
Merge branch 'master' of github.com:IPunchu/lawkillers

Conflicts:
	app/views/devise/registrations/edit.html.erb
	app/views/devise/registrations/new.html.erb
Merge branch 'master' into navbar