Ignoring .DS_Store files
Merge branch 'feature/101-basics'