changes to emoticon_coding
Merge branch 'master' of https://github.com/anov/honors