Added Colin's email, added TODO.txt
Fix Colin and John's merge conflict