modified:   batch.m
	modified:   drawResults.py
	modified:   measure/averageROC.py
	modified:   measure/plotResults.py
	measure/auc_mat.txt
Merge branch 'master' of ssh://github.com/wyli/texa

Conflicts:
	batch.m

	new file:   auc_bar.pdf
	new file:   auc_mat.txt
	modified:   batch.m
	modified:   drawSamples/sampleNow.m
	modified:   main.m
	measure/auc_mat.txt