fixed image files after merge

pushing our latest and greatest code, to get on same page.