Updated the server with the most recent code
Merge branch 'master' of github.com:dennn/SSPI