Merge branch 'master' of https://github.com/srang/elevator

Conflicts:
ElevatorMain.java