a

Signed-off-by: javapanda <java130409@yahoo.co.jp>
Merge branch 'master' of https://github.com/javapanda/test

Conflicts:
	譁ｰ縺励＞繝・く繧ｹ繝・繝峨く繝･繝｡繝ｳ繝・txt