Removed DS Store files. Added gitignore to keep them out.
Merge branch 'develop'