lab1 done again
Merge pull request #13 from lewenhagen/master

lab1 done again