added thumbs and changed names
Merge branch 'master' into catalogImages
changing file names for new image system
Merge branch 'master' into catalogImages
Changed more file names, other stuff
Merge branch 'master' into catalogImages

Conflicts:
	content/data-catalog.csv
	scss/tnris.scss
	templates/data-catalog-entry.html