Add smiley and cleanup
Fix merge conflicts.
Change the text and styling smileys
Merge branch 'master' of https://github.com/rhok-melbourne/lifeassist