Added a comment in Client.java; added .gitignore
Merge