testtt
Merge branch 'master' of https://github.com/KelvinEstMexicain/Projet3

Conflicts:
	Form1.cs
	bin/Debug/Projet3.exe
	bin/Debug/Projet3.pdb
	obj/x86/Debug/Projet3.csproj.FileListAbsolute.txt
	obj/x86/Debug/Projet3.exe
	obj/x86/Debug/Projet3.pdb