Conflicts:
	src/ExchangeOperator.C
	src/ExchangeOperator.h
	src/KPGridConnectivity.C
	src/KPGridConnectivity.h
	src/Species.C
	src/XCPotential.h
	src/Xc.h
	src/notes
	util/cell.plt
	util/econst.plt
	util/econst_cmp.plt
	util/econste.plt
	util/econste_cmp.plt
	util/egap.sh
	util/etotal.plt
	util/etotal_cmp.plt
	util/etotal_int.plt
	util/etotal_int_cmp.plt
	util/force.plt
	util/kpgen/kpgen.C
	util/qbox_msd.py
	util/sigma.plt
	util/temp_ion.plt
	util/volume.plt