Merge pull request #1 from Team-CTW/server-dev

Created the server