Removing .DS_Store
Updating .gitignore
Merge branch 'master' of github.com:jrcryer/generator-mean