Cleanup of the broken code :(

Conflicts:
	src/elevator/Elevator.java
Solving merging conflict