yo

Signed-off-by: kylox <maxime.gaudron@hotmail.fr>
Merge branch 'master' of https://github.com/kylox/MLPproject

Conflicts:
	MLPproject.suo
	MLPproject/MLPproject/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MLPproject/MLPproject/obj/x86/Debug/ResolveAssemblyReference.cache
	MLPproject/MLPprojectContent/obj/x86/Debug/ContentPipeline.xml
	MLPproject/MLPprojectContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MLPproject/MLPprojectContent/obj/x86/Debug/ResolveAssemblyReference.cache

Signed-off-by: kylox <maxime.gaudron@hotmail.fr>