Tâche n°2
Merge branch 'master' of https://github.com/delahayd/nfa021

Conflicts:
	tp/taches.txt