Updating template files
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
more mobile-friendly home and browse all
Replacing laughing guy with placeholder
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
Updating gitignores
Updating images folder
Updating image links in template files
Updating search box text & template files