A
Merge branch 'master' of github.com:tduccuong/ElevatorControlSystem

Conflicts:
	src/main/java/elevatorcontrolsystem/main/UserInterface.java