male zmeny
Merge branch 'master' of https://github.com/dygestor/optoset

Conflicts:
	Optoset/TabControl.Designer.cs
	Optoset/bin/Debug/Optoset.exe
	Optoset/bin/Debug/Optoset.pdb
	Optoset/obj/Debug/Optoset.csproj.GenerateResource.Cache
	Optoset/obj/Debug/Optoset.exe
	Optoset/obj/Debug/Optoset.pdb