removed iml and ignored it
removed the thing
Merge branch 'develop' of https://github.com/Jacob-Laverty/CS321 into develop
a;sldkfj
la;sdkjf
haaaaiii
added basic framework to monitorTemp in TempControl class
Update README
made monitorTemp less dumb, primarily need dummy classes for the objects that TempControl uses (all HVAC devices, Temperature, IndoorTempSensor). I think Ian has started doing that, but it needs to all be brought together. I closely followed Pettit's stuff on piazza, so you can reference his diagrams to reconcile everything.
Merge branch 'feature/hayley' of https://github.com/Jacob-Laverty/CS321 into feature/hayley
I went ahead and made all the object classes, everything should compile except need to rename RegulateTemp to Tempcontrol (to match pettit's interface)
Merged hayleys stuff with mine
Finished merge
Added new README