GameUtilまわり追加
Merge branch 'ssato'
マリオの表示
Revert "マリオの表示"

This reverts commit 1a85226f05c9b6e2de49485677cc9a398f6ffa18.
Merge pull request #5 from ushisantoasobu/feature/kojima

json読み込み機能追加
Merge branch 'master' of https://github.com/ushisantoasobu/crazymario into develop
マリオ調整。
Merge pull request #6 from ushisantoasobu/feature/munkhbat_mario

Feature/munkhbat mario
set stageTag
set stageTag in BackGround.cpp
敵生成。
コインの表示まわりコミット
Merge pull request #7 from ushisantoasobu/feature/munkhbat_mario

敵生成。
merge master
ステージデータ更新
Merge branch 'checkout/ssato'

Conflicts:
	Classes/BackGround.cpp
conflictでたところの対応がおかしかったので修正
add mario die animation
Merge branch 'checkout/ssato'
collision判定追加
Merge branch 'master' into feature/kojima

Conflicts:
	Classes/GameScene.cpp
	Classes/GameScene.h
	Classes/Mario.cpp
	Resources/gamadata.json