Merge pull request #6 from amychiu/amy/development

app icon and launching screen