revert
Fix for server
Merge branch 'master' of github.com:nickstanish/gladiator-server