Added image upload
Fixed merge conflict with gemfile lock
Fixed merge conflicts