create neighborhoods list views/controllers/specs
merge conflicts
merge conflicts fixed