commit TP1 20130913
Merge branch 'master' of https://github.com/jean-michelLottier/INF4410.git