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
Updating template files
Updated home page and tip profile page templates
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
Home page resizing
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Samantha
Home page resizing
Updating template for browse all page
Merge branch 'Linnea' of https://github.com/CSTeachingTips/CSTTSite

Conflicts:
	public_html/sites/all/themes/cstt_theme/views-bootstrap-thumbnail-plugin-style--browse-all.tpl.php
mostly fixed homepage thumbnail sizing
mostly fixed homepage thumbnail problems