Remove .DS_Store
Merge with origin master