最新master分マージ
当たり判定作成（途中）
collision判定追加
Merge branch 'master' into feature/kojima

Conflicts:
	Classes/GameScene.cpp
	Classes/GameScene.h
	Classes/Mario.cpp
	Resources/gamadata.json
当たり判定処理修正
Merge pull request #8 from ushisantoasobu/feature/kojima

Feature/kojima