my changes
Merge branch 'Nov29_Nickson' of https://github.com/Thermomiplex/Thermominator into Nov29_Nickson

Conflicts:
	server.py
Set point in server.py