started on lab2
Merge pull request #40 from lewenhagen/master

started on lab2