Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Linnea
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Linnea
Fixing themes
Updating theming files
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Linnea
Updating views
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Linnea
Adding modules/theming files
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
Adding filter module
Updating template files
added filters to browse all
Updated home page and tip profile page templates
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
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
hoping merge will work - index.html