merge1
horizon v1
Scenario section v1
ihm1_Scenario v2. En cours de dev
	modified:   css/ihm1.css
	modified:   ihm1.php
Bouton entre etape1 et etape2 IHM1 = ok. a faire css
Merge branch 'ihm1' of https://github.com/MonMIEL/MonMIEL_Website into ihm1
	modified:   ihm1.php
Merge branch 'ihm1' of https://github.com/MonMIEL/MonMIEL_Website into ihm1
Partie Mon Mix
ihm1 scenario2 v2 click dispo
conflict resolved
STEP et import grises
ihm1 scenario v3. ok
Merge branch 'ihm1' of https://github.com/MonMIEL/MonMIEL_Website into ihm1
idea+
idea --cached
idea --cached
Merge branch 'master' of https://github.com/MonMIEL/MonMIEL_Website
merged with ihm1