Pouet.
Merge remote-tracking branch 'origin/master'

Conflicts:
	TP2/main.cpp