Display images in views
Images added
Passed the failing test
Fixed merge conflict