Various changes, mostly to do with elevators

Elevators now capable of transporting people between floors. People are
still drawn on top of the elevators as they move, need to revamp
drawing method to be able to fix this.
Merge branch 'master'

Conflicts:
	src/main/Building.java