fixed gitignore
Merge branch 'origin/test'
Merge branch 'origin/master'