entregable 0.6
Merge branch 'master' of https://github.com/NaiaraAcosta/GDD2014