clean the editor code
Merge branch 'master' of https://github.com/seanxiaoxiao/cmu_hackathon

* 'master' of https://github.com/seanxiaoxiao/cmu_hackathon:
  Resolve the conflict