Merge pull request #21 from amychiu/amy/development2

updated search
Merge pull request #22 from amychiu/amy/development2

added bar code scanner
Merge pull request #23 from amychiu/amy/development2

renamed barcode scanner view controller
Merge pull request #24 from amychiu/amy/development2

updated storyboard