started on lab 1
Merge pull request #57 from lewenhagen/master

started on lab 1