Added Colin's information to README; Added TODO file.
Merge changes