Merge remote-tracking branch 'origin/master' into laptop-branch
test commit from laptop
Merge remote-tracking branch 'origin/master' into laptop-branch
Merge pull request #31 from johanjusits/laptop-branch

Laptop branch