New emote plus branch testing
Merge pull request #1 from XyyxShard/master

New emote plus branch testing