@KaoriMatsuokaを追加。
Merge branch 'master' of https://github.com/KaoriMatsuoka/matsuerb-nanoc into KaoriMatsuoka-master

Conflicts:
	resources/members.yml
Merge branch 'KaoriMatsuoka-master'