Added features
Merge branch 'master' of github.com:USherbrooke-IFT585/TP3