more on the first half on lab 2
started on files in lab 2
Merge pull request #62 from lewenhagen/master

more on the first half on lab 2