Added a bunch of game-related things. Mostly to do with the adding of
ships to a grid.

Enum for the grid blocks
Board class with a method for adding ship
Player class with a board object
Added a menu.
and now I have committed it aswell
Inga ändringar
Merge remote-tracking branch 'origin/Lars-Branch'

Conflicts:
	BattleShips/src/game/Board.java
	BattleShips/src/game/BoardPanel.java
	BattleShips/src/game/Game.java
	BattleShips/src/game/Player.java
	BattleShips/src/game/Ship.java
	BattleShips/src/game/Square.java
	BattleShips/src/main/Main.java
Merge remote-tracking branch 'origin/master' into Lars-Branch