message
message
message
message
Merge branch 'master' of https://github.com/lucysun/document_tagger

Conflicts:
	doc_tagger.py
	doc_tagger_final.py
	doc_tagger_trial.py