log
threading
resolved merge conflicts
merge
merge
resolved merge conflicts
resolved merge conflicts
resolved merge conflicts
fixed excess logger file problems
jk fixed logger forreal this time
Fixing the duplicate directories
Fixin the merge conflicts with xsolving directory duplicates