Working Submission
Merge branch 'master' of https://github.com/Soarnsky/ElevatorSimulation

Conflicts:
	src/ElevatorSimulation/Building.java
	src/ElevatorSimulation/Elevator.java
	src/ElevatorSimulation/GUI.form
	src/ElevatorSimulation/GUI.java
	src/ElevatorSimulation/PeopleGenerator.java
	src/ElevatorSimulation/Person.java
	src/ElevatorSimulation/Simulation.java