dialog konflikt
Merge branch 'batryk' of
https://github.com/KNIKPolitechnikaPoznanska/AtremProject.git into
batryk