added TODO
Merge branch 'master' into experiment.  Just fooling around.
Updated list.
Merge branch 'master' into experiment, dealing with potential conflicts
in LIST.

Conflicts:
	LIST