commit
Merge branch 'master' of https://github.com/sleepy-sheep/panda

Conflicts:
	Documents/開発/検証/git/myrepo.txt