elo
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