修改了消除逻辑(暂时不能生成新的)
Merge branch 'master' of https://github.com/opensourceBrown/DR

Conflicts:
	.gitignore