Adding .DS_Store to .gitignore
Merge branch 'master' of github.com:lumenlearning/candela