fixing merge conflicts
Merge branch 'master' of github.com:conradmuan/punboard
styled the leader board list
Merge branch 'master' of github.com:conradmuan/punboard