milestone
Merge branch 'master' of github.com:derrick0714/web_search_engin

Conflicts:
	indexing/src/include/models/StreamBuffer.cpp
	indexing/src/include/models/StreamBuffer.h