Depot Scaffold
Merge branch 'master' of https://github.com/dadaday/depot

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/dadaday/depot

Conflicts:
	.gitignore