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

Conflicts:
	CalorimeterRadControls.v11.suo
	CalorimeterUI/CalorimeterLocal.sdf
	CalorimeterUI/Logic/User.cs
	CalorimeterUI/obj/x86/Debug/CalorimeterUI.exe