MEMORIA: avanzando cap4
Merge branch 'master' of https://github.com/ocrespo/VNCpp.git