working on testing
Merge branch 'master' of https://github.com/rtoussaint/Elevator

Conflicts:
	.classpath
	Building.java
	Elevator.class
	ElevatorController.class
	Rider.class
	Rider.java