merge
Merge branch 'master' of github.com:bay6/union
modify the show of user
remove email from ranking
modify the ranking
Merge pull request #207 from caok/master

modify something