finish TODO.md
Merge branch 'upstream'

We have more things to do.

Conflicts:
	TODO.md