Merge branch 'master' into new-server
Merge branch 'master' into new-server
Fixes #11

Cleaned up all the unused code, unwanted comments, simplified statements.

Fixed bugs in block/unblock servers routine in both server and client
Merge branch 'new-server'