clean up by chao
Merge branch 'master' of github.com:chris19891128/EECS394