Added extra search modules
Added css_html
Merging with master
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Samantha
Merging with master
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Samantha
Merge branch 'Samantha' of https://github.com/CSTeachingTips/CSTTSite into Samantha
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Samantha
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Samantha
Adding updated HTML/CSS
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Samantha
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Samantha
Home page resizing
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Samantha
added about page
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Merging with master
Added about page
added media queries for resizing
added media queries for resizing
Merge branch 'Marisol'