test dev guigui
Merge pull request #2 from FlashPapa/dev-js

test dev guigui