retirer un a de trop
Merge branch 'master' of https://github.com/ftheriault/B32-Collaboration
Merge branch 'master' of https://github.com/ftheriault/B32-Collaboration
premier test fct2
Merge branch 'master' of https://github.com/ftheriault/B32-Collaboration
wut
Merge branch 'master' of https://github.com/ftheriault/B32-Collaboration
test
Merge branch 'master' of https://github.com/ftheriault/B32-Collaboration
ajout de conio
wtf
fix conflict