Minor changes.
Resolved merge conflict.
Implemented query c. Fixed bug causing query c to not recognize all requests from a certain IP.