temp
Signed-off-by: FlorentDancy <florent.dancy.1@ulaval.ca>
Merge https://github.com/b0ne/TP3

Conflicts:
	bin/FenetrePrincipale.class
	src/FenetrePrincipale.java