Changes to commit before pull because of error
Merge branch 'master' of https://github.com/zuowangda/Hotel
Edited tower model
edited model
Fixing up final issues with Cooling Tower system
Merge https://github.com/gbarrios318/Hotel