Added folded_train_and_test function to main.cpp.  Added merge(range,range) function to utils