et un pid...
Merge branch 'master' of https://github.com/antoinekagit/resistances

Conflicts:
	spaceship/ocaml/pid.ml
merge encore