'1.0'
Merge branch 'master' of https://github.com/karbonn/monProjet