Merge remote-tracking branch 'upstream/master'
test
register,login
fix confilt
Merge pull request #14 from Petrie/master

login