Try to merge.
Merge remote-tracking branch 'origin/master' into branch_snowzjx
Finish score page.
Merge pull request #16 from snowzjx/branch_snowzjx

Branch snowzjx