added prepROC function that formats trained classifier output to make ROC plot in R
fixed merge conflict that occurred for no reason