tasks and class notes
Merge pull request #2 from ebbyw/Ebby

tasks and class notes
Merge pull request #3 from RaulCarv/master

Merge pull request #1 from ebbyw/master
Merge pull request #2 from ebbyw/master

merge