merged working js code into master. I think bills on backend is not merged properly
Merge branch 'master' of github.com:panjiw/Team-Player