敵のターンでプレイヤーに当たった時に自滅するポイントの修正
Merge branch 'TakuyaDev'

Conflicts:

proj.ios/ScrollAndPickUp.xcodeproj/project.xcworkspace/xcuserdata/gpn.xc
userdatad/UserInterfaceState.xcuserstate
Merge branch 'TakuyaDev'
gignote
Merge branch 'TakuyaDev'
ゲームオーバー／クリア表示 ゲームスタート前演出実装
Merge branch 'master' of https://github.com/iichin0708/ScrollAndPickUp
xcbkptlist更新
Merge branch 'master' of github.com:iichin0708/ScrollAndPickUp
画像追加
Merge branch 'master' of https://github.com/iichin0708/ScrollAndPickUp into TakuyaDev

Conflicts:
	Classes/HelloWorldScene.h