リファクタリング
Merge branch 'master' of
https://github.com/AxlJPN/android_battleship.git

Conflicts:
	src/com/example/battleship/BattleShip.java