Refined the buttons x 2
Merge branch 'Villiams-branch'

Conflicts:
	BattleShips/src/game/Game.java
	BattleShips/src/main/GamePanel.java