updated gitignore
Merge branch 'develop' into addMatrix