uh
Merge branch 'master' of github.com:Pawamoy/ProjetIA

Conflicts:
	main.cpp
commentaires, zero, arg