Lab work 2
fixes !
Merge branch 'lab2_luksa' into Iwer_lab2