Pulling most recent code
Merge branch 'master' of https://github.com/srang/elevator
Fixing quasi-deprecated build errors, updating info on Factory implementation
Merge branch 'master' of https://github.com/srang/elevator

Conflicts:
	ElevatorMain.java