Deleted CaloriesHystory.txt
Merge branch 'master' of https://github.com/P-Beshkov/PS-Teamwork

Conflicts:
	CalorimeterRadControls.v11.suo