Merge pull request #4 from JeldorPKU/master

.gitignore modified
.gitignore modified for the server.
Merge pull request #6 from CAPU1995/master

.gitignore modified for the server.