Merge remote-tracking branch 'upstream/master'
lab 3 done, and small fix in lab 2
Merge pull request #16 from lewenhagen/master

testar så här...