Testing
New client options
server stuff
Merge branch 'master' of github.com:allam-matsubara/ci058-trab1