Update SimpleNGramGenerator.java
Merge branch 'master' of
https://github.com/pqviet1988/SearchSuggestion.git into development

Conflicts:
	PhraseSuggestion/src/assign2/examples/ngram/SimpleNGramGenerator.java
commit test 2
commit local dev test 3
Merge branch 'development' of
https://github.com/pqviet1988/SearchSuggestion.git into development

Conflicts:
	PhraseSuggestion/src/assign2/examples/ngram/SimpleNGramGenerator.java
commit local dev test 4
commit local dev test 6