Move to laptop
Delete .DS_Store
Merge branch 'development'
Ignore .DS_Store
Merge branch 'development'