Mise à jour de q2
Merge branch 'master' of https://github.com/Vincent-Methot/TP3

Conflicts:
	Python/q2.py