Merge remote-tracking branches 'origin/master' and 'origin/master'
Merge remote-tracking branch 'origin/master'
Removed .DS_Store files