stop word removal
Merge branch 'master' into stop_words
Fixed two bugs related to empty strings in the query
Merge branch 'master' into stop_words

Conflicts:
	index.php