Modifies to Task06 and Task07

I have the final version of my task07 but I need to do a pull request before, I could make the changes in the task 7.3.