BS
Merge branch 'master' into francis-branch
Commit of things and such and potato salad
Merge
Merge branch 'philippe-branch'
Fixed the potato salad
Merge branch 'master' of https://github.com/Prismik/pepito-pizzeria