Updated TODO.
Merge branch 'master' of github.com:terjr/forsterker2

Conflicts:
	TODO