Merge pull request #30 from johanjusits/laptop-branch

gitignore update
Merge remote-tracking branch 'origin/master' into laptop-branch