edited server
Merge pull request #15 from Eventalist/TimoorKurdi

edited server