Merge pull request #3 from qtang3/work1

cause conflict
Update data.j1
local
Update data.j1
resolve
Merge pull request #6 from qtang3/work1

Work1
Create init.js