Merge pull request #25 from amychiu/amy/development2

Amy/development2
commenting and NSLogs
Merge pull request #26 from jmr12345/dev-s

Code cleanup/commenting
Merge pull request #27 from amychiu/amy/development2

updates to search