Tidying up index view by the moving embedded Ruby into partial
Resolving merge conflicts
Creating CoffeeScript functionality for updating todo item
Adding Update action to the todo_items controller