updated TODO.txt
Merge branch 'master' of github.com:davidmarin/pbg

Conflicts:
	TODO.txt