??
Merge branch 'master' of https://github.com/colliauXD/PyCB

Conflicts:
	one_col_diag/Big_col.par
	one_col_diag/Big_col_a.par
	one_col_diag/Big_col_ab.par
	one_col_diag/Big_col_b.par
	one_col_diag/measures.pyc
	one_col_diag/myconnectors2.pyc