fixing server
Merge branch 'master' of github.com:mantazer/Project-Pulsar