Added a TODO.txt to track items needing addressed.
resolving conflicts