déplacements OK

Signed-off-by: Rec9 <recneuf@gmail.com>
Merge branch 'master' of https://github.com/kylox/MLPproject

Conflicts:
	MLPproject.suo
	MLPproject/MLPproject/bin/x86/Debug/MLPproject.exe
	MLPproject/MLPproject/bin/x86/Debug/MLPproject.pdb
	MLPproject/MLPproject/obj/x86/Debug/MLPproject.exe
	MLPproject/MLPproject/obj/x86/Debug/MLPproject.pdb