lab 2 done
Merge pull request #5 from lewenhagen/master

lab 2 done