Add some kaomoji
Merge branch 'master' into mac