Pushing to new Login Branch

Merging Login with Master