Recommitting. Trying to get toolbar again.
Testing configurations module
Adding config module for testing
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
Adding correct gitignore
Trying to fix Dylan's branch
Trying to fix Dylan's branch
trying to fix Dylan's branch
Ignoring default.settings.php
Delete default.settings.php

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