Getting rid of .DS_Store
Adding proper gitignore
Actually adding .gitignore
Merging with master
Adding new files
Adding .gitignore
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Justis
Updating new files.
Updating...?
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Justis
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Justis
Removed gradient from carousel controls and modified appearance.
Merge branch 'Justis'
Merge branch 'Linnea'
separated out header and footer
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Linnea
Merge branch 'Linnea' of https://github.com/CSTeachingTips/CSTTSite
Updating themes and deleting uneeded modules
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Linnea