Merge pull request #43 from amychiu/amy/development2

NSDefaults update
Merge pull request #44 from amychiu/amy/development2

fixes NSUserDefaults and errors when trying to search