さ
Merge branch 'master' of https://github.com/AT13B02/GL

Conflicts:
	sakamotokun.txt
Merge branch 'master' of https://github.com/AT13B02/GL

Conflicts:
	sakamotokun.txt