Add todo items to controller
Write tests for todo items
All good from earlier mishap
Added test for creating todo items and associated code
Add specs and code for editing todo items
Fix conflicts to merge branch to master
Clean up a few more files before merge