( ˘•ω•˘ ).｡oஇ追加
Merge branch 'master' of github.com:jack-and-rozz/emoticon into jack-and-rozz-master

Conflicts:
	emoticon.txt
Merge branch 'jack-and-rozz-master'