Attempting to get new modules
Other .DS_Store stuff
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Justis
Hopefull nothing goes wrong... Trying to pull before pushing/merging?
Added .DS_Store, working on untracking
Revert "Adding more modules"

This reverts commit 3a7349b18b1d4938ad81e60489007bd64ef5f2f9.
added some ds_store files
Recommitting. Trying to get toolbar again.
Fixing location of wordpress_migrate
Force deleted .DS_Store from repo
Force deleted public_html/.DS_Store
Adding more modules
adding modules to master
Merge branch 'Linnea'
trying to get rid of DS_Store files
Adding module for Vidushi
Getting rid of .DS_Store
testing config files
testing config files
Adding correct gitignore
Trying to fix Dylan's branch