tmp changes
Merge branch 'master' of https://github.com/jxjzhang/CS246

Conflicts:
	abbrev_phrase.json
	purifier.py
tmp
Merge branch 'master' of https://github.com/jxjzhang/CS246
new purifier
Merge branch 'master' of https://github.com/jxjzhang/CS246

Conflicts:
	purifier.py
new purifier 1.0
Merge branch 'master' of https://github.com/jxjzhang/CS246
Merge branch 'master' of https://github.com/jxjzhang/CS246
Merge branch 'master' of https://github.com/jxjzhang/CS246