merge commit
removed jems_tmp
Merge branch 'master' of github.com:wontaeyang/ilovejs