derp
Merge remote-tracking branch 'upstream/master'
tilfjet rapport og comments