Getting rid of .DS_Store
testing config files
testing config files
Trying to fix Dylan's branch
Trying to fix Dylan's branch
trying to fix Dylan's branch
Delete default.settings.php

Removing default.settings.php from the git repository and adding it to the gitignore
Fixing Dylan's branch
Merge branch 'Dylan' of https://github.com/CSTeachingTips/CSTTSite
Updating master
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
Testing config module
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Linnea