merge
merge
Merge branch 'master' of https://github.com/firebones/simul_proc
ajout gitignore