Fixed merge conflict
Merge pull request #23 from emmagard/random_stuff

Fixed merge conflict
App has clickable title and icon
Merge pull request #24 from emmagard/emma

added info for the readme
edited readme