Intro conclusiones
Merge branch 'master' of github.com:lluisYasT/PFC