Test pull 22:14 Samedi
Signed-off-by: FlorentDancy <florent.dancy.1@ulaval.ca>
Merge branch 'master' of https://github.com/b0ne/TP3

Conflicts:
	bin/FenetrePrincipale$1.class
	bin/FenetrePrincipale$2.class
	bin/FenetrePrincipale$3.class
	bin/FenetrePrincipale$4.class
	bin/FenetrePrincipale$5.class
	bin/FenetrePrincipale$6.class
	bin/FenetrePrincipale.class
	src/FenetrePrincipale.java