Task06
Task07
Merge branch 'master' of https://github.com/IsaacOlguin/Curso2014-2015
Merge remote-tracking branch 'upstream/master'
Merge pull request #175 from IsaacOlguin/master

Modifies to Task06 and Task07