Added another integration test, updated log
Merge branch 'master' of https://github.com/maryfeng/FinalSearchEngine

Conflicts:
	Tasks.txt
	org/uiowa/cs2820/engine/FinalIntegrationTest.java