a
Merge branch 'master' of
https://github.com/filiprozanski/hungerGames.git

Conflicts:
	games/src/pl/praktykiatrem/game/battleship/files/ShipIcons.java