Removed .DS_Store and fixed .gitignore
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'