Implemented query and extra credit query
Merge branch 'master' of https://github.com/slater1/560

Conflicts:
	mapred/invertedindex/output/part-00000
Bringing in ccraig's changes to invertedindex while putting in my updates to query
Merge branch 'master' of https://github.com/slater1/560