databasemigrering
gitignore
Merge branch 'master' of https://github.com/SlashDeveloper/VMTipping
a
Conflicts:
	.gitignore
	VMTippingClient/obj/Debug/App.g.cs
	VMTippingClient/obj/Debug/App.g.i.cs
	VMTippingClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	VMTippingClient/obj/Debug/MainWindow.g.cs
	VMTippingClient/obj/Debug/MainWindow.g.i.cs
	VMTippingClient/obj/Debug/VMTippingClient.csproj.FileListAbsolute.txt
	VMTippingClient/obj/Debug/VMTippingClient.csproj.GenerateResource.Cache
	VMTippingClient/obj/Debug/VMTippingClient.csprojResolveAssemblyReference.cache
	VMTippingClient/obj/Debug/VMTippingClient.exe
	VMTippingClient/obj/Debug/VMTippingClient.pdb
	VMTippingClient/obj/Debug/VMTippingClient_MarkupCompile.cache
	VMTippingClient/obj/Debug/VMTippingClient_MarkupCompile.i.cache