refactored todo-list.php for readability
Added upload and merge to existing list