commit test
Merge pull request #29 from johanjusits/branch-1

commit test
Merge remote-tracking branch 'origin/master' into laptop-branch