File transfer okay, but updater is suspended
Merge branch 'master' of github.com:Pisces000221/StayUnsweetened

Conflicts:
	FILELIST
Merge branch 'master' of github.com:Pisces000221/StayUnsweetened