testtest
修正しました
Merge pull request #1 from yoshi-fujiko/topicA

ぷるりくーー
Merge branch 'master' into ill

Conflicts:
	pc/sass/partial/mixin/_typography.scss