+ thread-safety
+ history
* upload progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.py
	uploader/uploader.py