Merge pull request #2 from lekland/asmir/test

fixed .gitignore
Merge remote-tracking branch 'origin' into asmir/test