Merge pull request #6 from gatepoet/master

Renamed server project