now ignoring .DS_Store files
Merge branch 'development'