first commit to github
Merge branch 'master' of github.com:hallepas/DEPOT

Conflicts:
	.gitignore