TODOs added
Merge branch 'tema3' of github.com:evelinad/TemeIDP into tema3