Merge branch 'master' of https://github.com/cmpt440/Elevator.git