started integration
Merge branch 'master' of https://github.com/bwise/searchengine

Conflicts:
	searchengine/Parser.cpp