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
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
Adding backup and migrate module
Removing config module
Removing front page module
Removing unecessary modules
Removing more unecessary modules
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol