almost done lab 1
Merge pull request #39 from lewenhagen/master

almost done lab 1