Merge pull request #56 from lewenhagen/master

fixes in lab 1,2,3,4
started on lab 1