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

Conflicts:
	Form1.cs