Initial check-in
Merge branch 'master' of github.com:wbiker/ki_di_p

Conflicts:
	.gitignore