todo list changed (branch)

branch changes merged into master