remove regex.js
use tmp
fix compare conflict
Merge branch 'master' of https://github.com/sonicyang/TestCode