lab 2 done
lab 2 done again
Merge pull request #14 from lewenhagen/master

lab 2 done