Merge pull request #29 from johanjusits/branch-1

commit test
gitignore update
Merge pull request #30 from johanjusits/laptop-branch

gitignore update