added config.php to .gitignore
ignoring .DS_Store files
Merge branch 'master' into settings-pane