Merge remote-tracking branch 'origin/Joe' into David
Attempting to fix gitignore
fixed gitignores for mac
removed extra gitignore
gitignore shit