last commit
Merge branch 'master' of https://github.com/chriskurn/SE350

Conflicts:
	src/elevator/testing/ElevatorControllerTest.java