konflikt
Merge branch 'RMI-Adm&Grz' of https://github.com/KNIKPolitechnikaPoznanska/AtremProject.git into RMI-Adm&Grz