resolves conflicts
adds steam animation rollover and images for ingredients page