gitignore
Revert "gitignore"

This reverts commit 63b253c9b82772899b68d03e5dade9f3321d630d.
gitignore
Merge branch 'Ania'
- Dodanie edit worker, alfa version
Merge branch 'master' of https://github.com/AnnRe/Aqua_proj

Conflicts:
	aquadrom.sln
	aquadrom/DB/DBConnector.cs
Ulepszenia wizualne w Harmonogramie
Merge branch 'master' of https://github.com/AnnRe/Aqua_proj

Conflicts:
	Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Harmonogram - zrobić dla każdej kolumny
AdminPanel view fix
TODO: kolory, ostrzeżenia, maile
Merge branch 'master' of https://github.com/AnnRe/Aqua_proj

Conflicts:
	Tests/bin/Debug/Tests.dll
	Tests/bin/Debug/Tests.pdb
	Tests/bin/Debug/aquadrom.pdb
	Tests/obj/Debug/Tests.csprojResolveAssemblyReference.cache
	Tests/obj/Debug/Tests.dll
	aquadrom/HarmonogramForm.Designer.cs
	aquadrom/HarmonogramForm.cs
Merge branch 'master' of https://github.com/AnnRe/Aqua_proj

Conflicts:
	aquadrom/aquadrom.csproj
Merge branch 'master' of https://github.com/AnnRe/Aqua_proj

Conflicts:
	Tests/obj/Debug/Tests.pdb
Merge branch 'master' into Ania