new thermo
Merge branch 'master' of https://github.com/GiggleLiu/meanfield

Conflicts:
	model_bc3.py
	setting/modelsetting.py