gitignore
merge
more dropzone files
deleting unwanted files
updates to dropzone