Server added
Merge pull request #1 from darkjoker/master

Server added