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

NSDefaults update