first commit with andres material. flattened search bar into nav bar. modified nav bar button items. cleaned up andres collectionview selection code
fixed merge conflicts