pushing changes before pulling from master
please fucking work
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
getting rid of .DS_Store
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Trying to pull from master
Removing front page module
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Justis
Updating new files.
Removing unecessary modules
Removing more unecessary modules
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Adding css and html
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
updated the more spacious index page.
updated front page, with correct toolbar and sagefox logo added. fixed a some formatting issues.
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Removing unwanted modules
Adding developer modules