corrected
Merge branch 'lab2' of github.com:AwfulHaircut/kompen into lab2
 corrected some more
Merge branch 'lab2' of github.com:AwfulHaircut/kompen into lab2