client can connect. Tested localhost
merged files
Merge branch 'master' of github.com:rbellido/Project