Changes and stuff.

Signed-off-by: Robert Truong <rtruong2@gmu.edu>
Merge remote-tracking branch 'Thermostat/master'

Conflicts:
	Thermostat/src/IndoorTempSensor.java
	Thermostat/src/ThermDriver.java