Organization.
Merge branch 'master' of https://github.com/dohnto/CDP

Conflicts:
	project-plan/project-plan.pdf