update to gitignore
Merge branch 'master' of https://github.com/salty3g/test2.git