Merge pull request #1 from jchild/master

updating yours
Finished Login.java (I thinks)
Merge pull request #4 from neshyd/master

pull