Removed print statements, moved TODOs into TODO.txt
Fixed merge conflicts.