user login backend working
Merge branch 'master' of github.com:tihuang/combopedia_heroku