login fixed
Merge branch 'master' of https://github.com/lawsonk1215/xtkvM9PykZs8lx0M