added removeTodo action in Todo controller
fixed merge conflicts