merging in Nico's changes

I moved/edited your code into a different file: login.java