Signed-off-by: mchabran <marine.chabran@gmail.com>
conflits réglés
Merge branch 'master' of github.com:mchabran/LO21

Conflicts:
	ProjetQt/ProjetQt.pro.user
	ProjetQt/dossier.cpp
	ProjetQt/dossier.h
	ProjetQt/main.cpp
modif loaddossier
Signed-off-by: mchabran <marine.chabran@gmail.com>