Minor changes made
Merge branch 'hvac_controller' of https://github.com/wetherbeei/SD2013-UIUC into hvac_controller