Added thermal functions
Merge branch 'master' of https://github.com/life-mob/MechThermaL

Conflicts:
	thermo.cpp
Added thermal functions