Not sure what's going on here, I think I'm merging with yours
Merge branch 'master' of https://github.com/Yinchcactus/ElevatorQuarterProjectRevised

Conflicts:
	Elevator Quarter Project
Revised/build/classes/elevator/quarter/project/elevatorsystem/RegElevato
r.class
	Elevator Quarter Project
Revised/build/classes/elevator/quarter/project/population/RegPerson.clas
s
gah