lab2 initial
Merge pull request #39 from lewenhagen/master

lab2 initial