l
Merge remote-tracking branch 'origin/master'

Conflicts:
	KL_cal.pyc
	pearson_correlations.py