Hopefull I'm not doing something crazy.
Merge branch 'master' of https://github.com/efferencecopy/docubase

Conflicts:
	.gitignore