maj
Merge branch 'master' of https://github.com/PixelSenseEnib/PixelSense
pptys
Merge branch 'master' of https://github.com/PixelSenseEnib/PixelSense

Conflicts:
	Soutenance/modele-ENIB-2010.pptx