upload -> sync
Merge branch 'master' of github.com:NatTuck/fogsync-go

Conflicts:
	src/shares/sync.go
Fetch block archive.