first change by Wenjia
Merge branch 'master' of https://github.com/Chianti5/final_project
Delete .DS_Store
Merge pull request #2 from Chianti5/master

changes by Wenjia