update todo
Merge branch 'master' into haskell

Conflicts:
	todo.txt