Moved from tribe repository
Merge branch 'master' of https://github.com/danderson00/tribe.storage

Conflicts:
	.gitignore