fixed upload script
index on master: 5326624 fixed upload script
WIP on master: 5326624 fixed upload script
Merge commit 'stash'

Conflicts:
	config.json
	get_imgs.js