Merge origin/master
Fixed half minute detection.
Conflicts:
	FAA_OCR/src/faa_ocr/ADTs/Airport.java
Fixed heading parsing.
Merge origin/master