Modify .gitignore
Remove .DS_Store
Merge branch 'master' of https://github.com/marvinyan/CSC130