login/register done
Merge branch 'master' of https://github.com/yaoyi/collab