update
Merge branch 'master' of github.com:tw4452852/storage

Conflicts:
	init.go
	repo_local.go