merged
all things working kinda
city search auto there
dssd
same page sync
same page sync
same page sync
kirstins changes added
Merge branch 'master' into kristin
Merge branch 'master' into kirk
edited space.rb and _new_space.erb
edited _description_tab.html.erb
edited _description_tab.html.erb
sanity check around spaces.rb
added space.reb def
added space.reb def
edited self.room_types under space.rb
edited self.room_types under space.rb
added a/v to amenities
added koser bit