0.1
0.2
Merge branch 'master' of https://github.com/cbcye/AutoBackupAndUpload_AliYun

Conflicts:
	gitfile.txt
merge