updated gitignore to ignore local database settings
added .DS_Store to gitignore and removed database.yml from being tracked
Merge remote-tracking branch 'origin/master'