Commit changes
Merge branch 'master' of https://github.com/fgrami01/sp2-cw3-2014.git

Conflicts:
	cw3/Building.java
	cw3/Elevator.java
	cw3/Runner.java