Hopefully this fixes it for you
Merge branch 'master' of https://github.com/Yinchcactus/ElevatorQuarterProjectRevised

Conflicts:
	Elevator Quarter Project
Revised/build/classes/elevator/quarter/project/elevatorsystem/RegElevato
rController.class