'project manager creates todo' feature passing green.
Resolved merge conflicts from origin master.