lab1 v0.1 ready for testing
Merge pull request #38 from lewenhagen/master

lab1 v0.1 ready for testing