kwabi shwsv iuq
Merge branch 'master' into ogi

Conflicts:
	aquadrom/AdminPanel.Designer.cs
	aquadrom/AdminPanel.cs
Dodanie plików do repo
Fixy fixy
baza coś tam
Revert "baza coś tam"

This reverts commit 8ffefef63f5a4ed4f00feb20e9d0412ee1ca166c.
Merge branch 'master' of https://github.com/AnnRe/Aqua_proj