update
Merge branch 'master' of https://github.com/Oksana-Ivanova/Cost_manager_desktop

Conflicts:
	Desktop/Desktop.v12.suo
	Desktop/Desktop/DBHandler.cs
	Desktop/Desktop/Desktop.csproj
	Desktop/Desktop/Form1.Designer.cs
	Desktop/Desktop/Form1.cs
	Desktop/Desktop/Incomes.Designer.cs
	Desktop/Desktop/Incomes.cs
	Desktop/Desktop/LoginForm.Designer.cs
	Desktop/Desktop/LoginForm.cs
	Desktop/Desktop/My_outlays.Designer.cs
	Desktop/Desktop/My_outlays.cs
	Desktop/Desktop/New Incomes.Designer.cs
	Desktop/Desktop/New Incomes.cs
	Desktop/Desktop/New_Category_Form.Designer.cs
	Desktop/Desktop/New_Category_Form.cs
	Desktop/Desktop/New_cost_form.Designer.cs
	Desktop/Desktop/New_cost_form.cs
	Desktop/Desktop/SqlFunction.cs
	Desktop/Desktop/bin/Debug/Desktop.exe
	Desktop/Desktop/bin/Debug/Desktop.pdb
	Desktop/Desktop/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	Desktop/Desktop/obj/Debug/Desktop.Main.resources
	Desktop/Desktop/obj/Debug/Desktop.csproj.FileListAbsolute.txt
	Desktop/Desktop/obj/Debug/Desktop.csproj.GenerateResource.Cache
	Desktop/Desktop/obj/Debug/Desktop.exe
	Desktop/Desktop/obj/Debug/Desktop.pdb