bricolage design
Merge pull request #87 from SSD-ESIEA/design

bricolage design
Merge pull request #88 from SSD-ESIEA/dev

Dev