First commit for Guillaume
Merge branch 'master' of https://github.com/jracine/GTI525.git