save work
Merge remote-tracking branch 'origin/mac'

Conflicts:
	lib/upload-file.js
	package.json