Added image helper for saving and getting images
Changed the main activity
Resolved merge conflicts