Added uploading images functionality but running into a nil error.
fixing merge conflicts