Updating server files
Merge branch 'master' of https://github.com/FlouCapt-GroupC/project