pulling
merging server
Merge pull request #11 from im11041991/master

merging server