Kevin F. & Kevin T. Query.Java now outputs correctly
Kevin: resolving merge conflict in query.Java