changed directory name
Merge branch 'master' of https://github.com/f7n/uploader

Conflicts:
	upload