Merge, legeres modif pour faire un deploiement
Merge branch 'master' of https://github.com/Bar-ENSTA-Paristech/bar-software