js
Merge branch 'master' of https://github.com/cashsun/fightclub
do a full page test before commit!!!!