początki strzelania
Merge branch 'master' of
https://github.com/filiprozanski/hungerGames.git

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/graphic/panels/BoardGraphicSettingPanel.java
	games/src/pl/praktykiatrem/game/battleship/graphic/panels/ShipSettingPanel.java
merged
rozwój strzelania
Merge remote-tracking branch 'origin/Wiktor'

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/graphic/SettingPresenter.java
	games/src/pl/praktykiatrem/game/battleship/graphic/panels/BoardGraphicSettingPanel.java
przeprawione startgraphic
kurrrrrrr
naprawione!
Merge branch 'master' of
https://github.com/filiprozanski/hungerGames.git

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/graphic/StartGraphic.java
.
Merge branch 'master' of
https://github.com/filiprozanski/hungerGames.git

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/graphic/StartGraphic.java
up to date
blokowanie planszy gdy statek obraca się
Merge branch 'master' of https://github.com/filiprozanski/hungerGames.git
zaraz tu wybuchnie wojna
dużo tego
menu stuff
Merge branch 'master' of
https://github.com/filiprozanski/hungerGames.git

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/graphic/SettingPresenter.java
	games/src/pl/praktykiatrem/game/battleship/graphic/StartGraphic.java
	games/src/pl/praktykiatrem/game/battleship/menu/MainView.java