test conflict 0
Merge branch 'master' of https://github.com/adherentx/CoF_arb.git

Conflicts:
	Sage_Sim/CoF_arb.py