untracked conf.mat
removed a bunch of mat files
updated gitignore
removed local .gitignore
removed local gitignore
updated top-level gitignore
updated gitignores