Adding T6 & T7
update to tasks 6 & 7
Merge pull request #136 from jorgegvalencia/master

jorgegvalencia T6 & T7