Update to TODO
Merged stuff from Rob

Merge branch 'master' of github.com:johnomics/basicr

Conflicts:
	TODO.org