commuting with bobs server
Merge branch 'master' of https://github.com/connorbarnett/ThermalRunaway

Conflicts:
	Thermal.xcodeproj/project.xcworkspace/xcshareddata/Thermal.xccheckout