bla
Merge branch 'master' of https://github.com/freohr/projet-jmc

Conflicts:
	code/Projet-jmc.layout
	code/main.c