Should end soon...
Merge branch 'master' of http://github.com/cabouffard/ift630-tp3