MAJ Materiel
Merge branch 'master' of https://github.com/L-Naej/hackaton-imac-2014