HOMESTRETCH HOMESLICE
Merge branch 'master' of https://github.com/bwise/searchengine

Conflicts:
	searchengine/dictionary.cpp