Implemented addServer and deleteServer.
Merge branch 'master' of https://github.com/amsunderman/362.git