Conflict readme

.classpath

.gitignore

.project

.settings/org.eclipse.buildship.core.prefs

.settings/org.eclipse.jdt.core.prefs

README.md

build.gradle

build/classes/java/test/elevator/ElevatorSimulatorTest.class

...ts/tests/test/classes/elevator.ElevatorSimulatorTest.html

build/reports/tests/test/css/base-style.css

build/reports/tests/test/css/style.css

build/reports/tests/test/index.html

build/reports/tests/test/js/report.js

build/reports/tests/test/packages/elevator.html

...test-results/test/TEST-elevator.ElevatorSimulatorTest.xml

build/test-results/test/binary/output.bin

build/test-results/test/binary/output.bin.idx

build/test-results/test/binary/results.bin

build/tmp/compileTestJava/previous-compilation-data.bin

src/main/java/elevator/MainElevator.java