年の下限・上限を設定
Merge remote-tracking branch 'origin/master' into mascotapp

Conflicts:
	gbacal.c