pushing changes before pulling from master
please fucking work
Force deleted .DS_Store from repo
Force deleted public_html/.DS_Store
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Adding more modules
adding modules to master
Merge branch 'Linnea'
trying to get rid of DS_Store files
getting rid of .DS_Store
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Adding module for Vidushi
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Getting rid of .DS_Store
testing config files
testing config files
Adding correct gitignore
Trying to fix Dylan's branch
Trying to fix Dylan's branch
trying to fix Dylan's branch