fixing server issues
Merge pull request #8 from fgarbagnati/setting-up-server

fixing server issues