Query2 merged
added test file
updated Makefile
query 2 tests added