Merge pull request #5 from amychiu/amy/development

added settings bundle