test emilie
incrément 1 ok
commit emilie
Merge branch 'master' of
https://github.com/epaillous/FrigoTimeMachine.git

Conflicts:
	WebContent/WEB-INF/frigo.jsp