test
Merge branch 'master' of https://github.com/JackalChan/H5_LuckySlots

Conflicts:
	index.html
	js/set_script.js
Merge branch 'master' of https://github.com/JackalChan/H5_LuckySlots