Merge pull request #16 from nfeliciano/loginScreen

Works as intended