Merge branch 'melissa'

scenariovirus.txt

src/main/java/app/SimulatorApplication.java

src/main/java/controller/Controller.java

src/main/java/model/Board.java

src/main/java/model/EmptySquare.java

src/main/java/model/Entity.java

src/main/java/model/EntityNotFoundException.java

src/main/java/model/EntityScenario.java

src/main/java/model/EntitySpawner.java

src/main/java/model/Model.java

src/main/java/model/Road.java

src/main/java/model/Scenario.java

src/main/java/model/doctorviruspatient/Doctor.java

.../model/doctorviruspatient/DoctorVirusPatientScenario.java

src/main/java/model/doctorviruspatient/Patient.java

src/main/java/model/doctorviruspatient/Virus.java

src/main/java/model/firefighterscenario/AirTanker.java

src/main/java/model/firefighterscenario/Cloud.java

src/main/java/model/firefighterscenario/Fire.java

src/main/java/model/firefighterscenario/FireFighter.java