Entrega
Merge branch 'master' of https://github.com/xguii/Epidem