Merge pull request #32 from lewenhagen/master

started lab 1
Merge pull request #33 from lewenhagen/master

more lab 1
Merge pull request #34 from lewenhagen/master

more to lab 1
Merge pull request #35 from lewenhagen/master

more lab 1 stuffs
Merge remote-tracking branch 'upstream/master'
2 more on lab 1