commit TP2 20131220
Merge branch 'master' of https://github.com/jean-michelLottier/INF4410