Initial commit
Merge branch 'master' of https://github.com/caldwecr/depot2

Conflicts:
	.gitignore