Conflict resolve
Conflict resolve

sadiqmmm/dropzone-rails-demo,mohsalsaleem/dropzoneExample,sadiqmmm/dropzone-rails-demo,BoTreeConsultingTeam/dropzone-rails-demo,neelar/rubyProject,sudharti/dropzone-rails-demo,rememberlenny/image-drop-newsletter-generation,rememberlenny/image-drop-newsletter-generation,sadiqmmm/dropzone-rails-demo,rememberlenny/image-drop-newsletter-generation,SoxFace/dropzone-rails-demo,sudharti/dropzone-rails-demo,sudharti/dropzone-rails-demo,chandantiatros/dropzone-rails-demo,neelar/rubyProject,SoxFace/dropzone-rails-demo,SoxFace/dropzone-rails-demo,neelar/rubyProject,BoTreeConsultingTeam/dropzone-rails-demo,mohsalsaleem/dropzoneExample,mohsalsaleem/dropzoneExample,chandantiatros/dropzone-rails-demo,BoTreeConsultingTeam/dropzone-rails-demo,chandantiatros/dropzone-rails-demo