lab1 done
Merge pull request #12 from lewenhagen/master

lab1 done