阿部もスクロールを40に変更。
Merge branch 'develop' of https://github.com/ryu8179/CafeDeMaid into develop

Conflicts:
	src/jp/ac/trident/game/maid/main/GameMain.java