added test script to package.json.
Merge pull request #413 from Floby/upload-skip-conflicts

add option to skip conflicts when uploading.
added myself to maintainers list.
add some tests for SKIP feature