fixed collection view segue
cleaning up code
cleaning up code, fixing search bar
Merge pull request #10 from jmr12345/dev-3

Updates/fixes