added new2file.txt and modified todo.txt
merge