Merge pull request #6 from XyyxShard/master

Merge more ponypack updates
foodsiren and supertoot by tension vex
Merge pull request #30 from TensionVex/master

foodsiren and supertoot by tension vex #YOLO
Merge emotes
Merge branch 'berach-master'
Merge pull request #8 from XyyxShard/master

Couple more emotes to fix
Fix some emote ordering
Merge some local changes with internet changes
Merge pull request #4 from Woll0r/master

More Berach-emotes! One less duplicate!