fixed gitignore
Merge branch 'origin/test'