added the ability to login with username and password
added the ability to login with username and password
Merge branch 'username-login'