Added categories to YelpSites class
fixed merge issues