Hopefully this will fix things
Merge branch 'master' of https://github.com/Yinchcactus/ElevatorQuarterProjectRevised

Conflicts:
	Elevator Quarter Project
Revised/build/classes/elevator/quarter/project/ElevatorQuarterProject.cl
ass
	Elevator Quarter Project
Revised/build/classes/elevator/quarter/project/structures/RegBuilding.cl
ass