gitignore intellij dir and .DS_Store
Merge branch 'master' of https://github.com/foodcoop/foodcoop-api