Added ThermalStatistics.{cc,hh}
fixed conflict