user scores update
Merge branch 'master' of github.com:DannyT/hasbroplayhack
fixing merge conflict
Merge branch 'master' of github.com:DannyT/hasbroplayhack
Merge branch 'master' of github.com:DannyT/hasbroplayhack