kombinowanie
Merge https://github.com/castoridae/naval-battle-sim

Conflicts:
	NavalBattleSim/src/event/ReloadEvent.java

Poprawa zaczynania halsowania
Merge https://github.com/castoridae/naval-battle-sim

Conflicts:
	NavalBattleSim/src/navalbattlesim/Army.java
	NavalBattleSim/src/navalbattlesim/NavalBattleSim.java
Merge https://github.com/castoridae/naval-battle-sim

Conflicts:
	NavalBattleSim/src/navalbattlesim/Army.java