little piddly changes trying to make things work. Also, added all images and thumbnails.
fixing merge conflicts in index.erb