Update todo.txt
merge master