Merge remote-tracking branch 'upstream/master'
2 more on lab 1
Merge pull request #37 from lewenhagen/master

2 more on lab 1