Depot app
Merge branch 'master' of https://github.com/gaanon/depot

Conflicts:
	.gitignore