first half in lab 2
Merge pull request #61 from lewenhagen/master

first half in lab 2