modified:   classify/calibration.py
	modified:   measure/averageROC.py
Merge branch 'master' of github.com:wyli/texa

Conflicts:
	classify/calibration.py
	measure/averageROC.py

	modified:   classify/calibration.py
	modified:   classify/platt.py