adding DS_Store to .gitignore
Merge branch 'master' of https://github.com/chrisjackson1982/margarine