Panel mis en place
merge
Merge branch 'master' of https://github.com/fgascon/log121-lab4

Conflicts:
	src/ca/etsmtl/log121/labo4/FenetrePrincipale.java