accueil_controller
Merge branch 'master' of github.com:imie-source/CDI-N-09_G2

Conflicts:
	FilrougeIHM/src/org/imie/Accueil_Controller.java