rm .DS_Store
Merge branch 'add-description'