Merge pull request #1 from zuowangda/master

Fix the problem in reorganizing the folder
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
Test of the Cooling Tower that has one error about overriding modifiers
Set up for example that has to do with the boiler and small final changes for the boiler model
Boiler Example started and seems to be working
Fixing names and connections in the model
Files that were made everytime changes were saved and made, part of the simulation
Add script to open both hotel and buildings package
Merge remote-tracking branch 'upstream/master'