マリオジャンプ制限
Merge branch 'master' into feature/mario_fix

Conflicts:
	Classes/GameScene.cpp
	Classes/GameScene.h
Merge pull request #11 from ushisantoasobu/feature/mario_fix

Feature/mario fix