WIP
Merge branch 'master' of https://github.com/alkedr/tiny-yandex-disk-uploader

Conflicts:
	main.cpp