fixed req 3 and added sysos to show how output should look
resolved conflicts in query

Conflicts:
	src/com/lab4/Query.java

 changed back to void  methods