メイン
プレイヤーの追加
Merge pull request #1 from ooHIROoo/player

プレイヤーの追加
Merge branch 'player' of https://github.com/ooHIROoo/gametest2 into ooHIROoo-player
異議あり
Merge branch 'ooHIROoo-player'
Merge branch 'enemy' of https://github.com/kazukin134/gametest2 into kazukin134-enemy
Merge branch 'kazukin134-enemy'
Merge branch 'master' of https://github.com/PS14/gametest2