Server now supports a maximum number of connections
Merge branch 'master' of github.com:Nevinli158/118P1