Merge pull request #35 from johanjusits/laptop-branch

updated gitignore