Merge pull request #21 from Kagetsuki/master

various WIP and added emoji
svg追加
修正
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'nazuki/master'
re-arranged assets