index.js
M
Merge remote branch 'origin/master'
Merge pull request #15 from TomasRan/master

modify index.js
Merge remote branch 'origin/master'
modify package.json & yaoyiyao.js
modify app.js