Eventmanager
Merge branch 'master' of github.com:castoridae/naval-battle-sim

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