lab3 done
Merge pull request #65 from lewenhagen/master

lab3 done