unikanie kolizji w trakcie prac
Merge https://github.com/castoridae/naval-battle-sim

Conflicts:
	NavalBattleSim/src/navalbattlesim/NavalBattleSim.java

unikanie się
Merge https://github.com/castoridae/naval-battle-sim

Conflicts:
	NavalBattleSim/src/navalbattlesim/NavalBattleSim.java
	NavalBattleSim/src/scenario/Scenario.java
	NavalBattleSim/src/vessel/TestShip.java