changing database.yml
items neighborhood and users controllers
pulling
removing secondary nav bar
fixing merge conflicts