lab2 ready for testing
Merge pull request #43 from lewenhagen/master

lab2 ready for testing