fixed .gitignore
Merge branch 'master' into broadening
fixed damnit
Merge branch 'master' into broadening