поправил сервер
Merge branch 'dev' of https://github.com/Shri-Hackathon/hackathon-1 into dev