Basis
Merge branch 'master' of github.com:OpenCoders/PODB

Conflicts:
	.gitignore
Merge branch 'master' of github.com:OpenCoders/PODB

Conflicts:
	.gitignore