lab3 done and small fix to lab4
Merge pull request #27 from lewenhagen/master

lab3 done and small fix to lab4