test branch
test branch
creation du fichier .gitignore
Merge branch 'master' of github.com:AntoineWillems/Bibliotheque into dev/abdoul
 gitignore
Merge branch 'master' into dev/abdoul
test
Merge branch 'dev/abdoul'
Merge branch 'master' into dev/antoine
Merge branch 'master' into dev/abdoul
Merge branch 'dev/antoine' into dev/abdoul
Merge branch 'dev/abdoul' of github.com:AntoineWillems/Bibliotheque into dev/abdoul
Resolution conflit
Merge branch 'dev/abdoul' of github.com:AntoineWillems/Bibliotheque into dev/abdoul
Merge
Ajout de l'utilisateur
Ajout de la classe utilisateur
Ajout de l'utilisateurController et UtiliateurViews
Merge remote-tracking branch 'remotes/origin/dev/antoine' into dev/abdoul
Merge branches 'dev/abdoul' and 'master' of https://github.com/AntoineWillems/Bibliotheque into dev/abdoul