lab 4 done and lab3 fix
Merge pull request #17 from lewenhagen/master

lab 4 done and lab3 fix