working on displaying images from url
Fixing merge conflicts