Added .DS_Store to .gitignore
Merge branch 'master' of https://github.com/alec-heif/6470-project