ADD File
Merge branch 'master' of https://github.com/manchot-team/projet

Conflicts:
	Manchot/Manchot/Form1.cs