Filled in queryPlace method.
Updated PathCalculator to follow queryPlace method signature.
Resolved merge conflicts.