added settings.gradle that was accidentally ignored
Ignore .DS_Store and merge remote-tracking branch 'upstream/master'