Fixed some small bugs
Merge branch 'masterMaster' of https://github.com/Rialaado/Grupa4 into masterMaster