company names show up on listings, completes user story 80
all green
fix merge conflict