敵追加
Merge branch 'master' of github.com:akinori89/jump

Conflicts:
	jump/Player.m