added response messages
log file
resolved merge conflicts
resolved merge conflicts
merge
merge
adding back files
resolved merge conflicts
vic's updates
merge
merging
resolved merge conflicts
merge
resolved merge conflicts
resolved merge conflicts
txt
merge
vic update
Further fixes to memory
resolved merge conflicts