calorimeter problem. to add or not to add

Question

Calcium chloride, CaCl2 is added to canned vegetables to maintain the vegetables' firmness. When added to water it dissolves: A calorimeter contains 2.5 mol ofwater at 26.51 degrees celsius. When 2g of calcium chloride is added to the calorimeter, the temperature rises to 29.51 degrees celsius. Assume that all the heat given off by the reactions if transferred to the water.
Calculate q for the reaction system.

Answer 1

Is your question whether or no to add the mass of the calcium chloyto the mass of the water when using 

q = mCDeltaT?  Yes. In more advanced chem courses thet do add the masses