Merge branch 'master' into laptop-branch
Merge pull request #1 from kjergens/laptop-branch

Merge branch 'master' into laptop-branch. Trying stuff.