initial commit
Merge branch 'master' of github.com:gillanr/depot

Conflicts:
	.gitignore