no message
no message
Merge branch 'master' of https://github.com/x0r42/projet-A2

Conflicts:
	Doc/docs/Bilans personnel - David L.odt