Files -> Input Sream
Merge branch 'master' of https://github.com/erzr2/ZbwTrainingGen

Conflicts:
	src/com/erikpartridge/Airport.java
	src/com/erikpartridge/Boston.java
	src/com/erikpartridge/Loader.java