Merge pull request #31 from roomblocker/expedia

Expedia
Merge branch 'rooms-search-results' of https://github.com/davecyen/roomblocker-mean into dev

* 'rooms-search-results' of https://github.com/davecyen/roomblocker-mean:
  Removed rooms.json
  Created rooms.json file in Westin San Francisco Market Street directory. Refactored home and city controllers
  Updated comments in controller to better explain the functions
  Added logic to the cities controller. On page load, the URL params are parsed and populate the total # rooms and individual # room fields.
Merge branch 'expedia' of https://github.com/roomblocker/roomblocker-mean into dev