I dun did shit
Merge branch 'master' of
git@github.com:AstonJPDTeam6/AirportSimulator.git

Conflicts:
	Airport Simulator/src/aston/JPDTeam6/SimulatorLibrary/Simulator.java
	Airport Simulator/src/aston/JPDTeam6/SimulatorLibrary/View/View.java

Also Antoine fixed other shit because he's so sexy