removed .ds_store
removed
Merge branch 'master' of github.com:njhamann/Front-end-Scaffolding-Workflow