lab 6 done
Merge pull request #19 from lewenhagen/master

lab 6 done