test commit
Merge remote-tracking branch 'origin'
Merge branch 'master' of https://github.com/AxlJPN/android_battleship
Merge branch 'master' of https://github.com/AxlJPN/android_battleship.git
Merge branch 'master' of https://github.com/AxlJPN/android_battleship.git
Enumクラスを別パッケージに移動