hard !
LIVE FREE OR DIE HARD
dodane menu do wyboru poziomu trudności, i opcja do gry pc vs pc, ale
jeszcze nie zaimplementowana
Merge branch 'master' of
https://github.com/filiprozanski/hungerGames.git

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/graphic/shooting/ShootingControllerForOnePlayer.java
common
+565
Merge branch 'master' of
https://github.com/filiprozanski/hungerGames.git

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/graphic/shooting/ShootingControllerForOnePlayer.java
	games/src/pl/praktykiatrem/game/menu/menuStart.java
pc vs pc
almost working hard
Merge branch 'master' of https://github.com/filiprozanski/hungerGames.git
poziomy trudności dla custom rules
sieć
Merge branch 'master' of https://github.com/filiprozanski/hungerGames.git
...
elo
debug ustawiania, początek ttt
Merge branch 'master' of
https://github.com/filiprozanski/hungerGames.git

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/rules/CustomRules.java
	games/src/pl/praktykiatrem/game/battleship/rules/Game.java
	games/src/pl/praktykiatrem/game/battleship/rules/OriginalRules.java
	games/src/pl/praktykiatrem/game/battleship/rules/Rules.java
...
Merge branch 'master' of
https://github.com/filiprozanski/hungerGames.git

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/rules/CustomRules.java
	games/src/pl/praktykiatrem/game/battleship/rules/OriginalRules.java
poprawione dziedziczenie w bs