Have images in nsarray
Resolved merge conflicts