updated todo
Merge remote-tracking branch 'github/master'

Conflicts:
	stuff/todo.todo