Merge origin/master
Added test images.
Conflicts:
	FAA_OCR/src/faa_ocr/ADTs/Airport.java