lab 4 done
Merge pull request #46 from lewenhagen/master

lab 4 done