test
Nshape include
"Create a shape"  code model done
integrate nshape
include nshape
Nshape full integrated
binaries
?
remove bin
Merge remote-tracking branch 'origin/Corentin' into Nicolas

Conflicts:
	.gitignore
	Text2UML.v12.suo
	Text2UML/Text2UML.csproj
	Text2UML/View/Text2UML.xaml
	Text2UML/View/Text2UML.xaml.cs
	Text2UML/bin/Debug/Text2UML.exe
	Text2UML/bin/Debug/Text2UML.pdb
	Text2UML/bin/Debug/Text2UML.vshost.exe
	Text2UML/obj/Debug/App.g.cs
	Text2UML/obj/Debug/App.g.i.cs
	Text2UML/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	Text2UML/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Text2UML/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
	Text2UML/obj/Debug/Text2UML.csproj.FileListAbsolute.txt
	Text2UML/obj/Debug/Text2UML.csproj.GenerateResource.Cache
	Text2UML/obj/Debug/Text2UML.csprojResolveAssemblyReference.cache
	Text2UML/obj/Debug/Text2UML.exe
	Text2UML/obj/Debug/Text2UML.g.resources
	Text2UML/obj/Debug/Text2UML.pdb
	Text2UML/obj/Debug/Text2UML_MarkupCompile.cache
	Text2UML/obj/Debug/Text2UML_MarkupCompile.i.cache
	Text2UML/obj/Debug/View/Text2UML.baml
	Text2UML/obj/Debug/View/Text2UML.g.cs
	Text2UML/obj/Debug/View/Text2UML.g.i.cs