ignore DS_Store and remove it
Merge branch 'master' of github.com:arcticmatt/CS121