so your up to date
Merge branch 'master' of https://github.com/Yinchcactus/ElevatorQuarterProjectRevised

Conflicts:
	Elevator Quarter Project
Revised/src/elevator/quarter/project/population/RegPerson.java