Savoir quel os.
Merge branch 'master' of https://github.com/mathieulachance/LOG121_TP4

Conflicts:
	LOG121_TP4/src/ets/gui/PanneauPrincipal.java