Merge branch 'master' of github.com:rubyisapm/upload

Conflicts:
	.idea/workspace.xml