They're both right as far as we know, although Thermodynamicist B's theory has not been exhaustively proven. Also, after you add enough energy it more or less ceases to be 'matter'. Login to read more.