added project settings & any mac apple files to be ignored
Merge remote-tracking branch 'origin/master'