shm-SV ftok arreglado
Merge branch 'master' of github.com:contiver/SO-cinema

merge