Small changes and fixes.
Merge branch 'tema1' of https://github.com/dianaprajescu/proiect-idp.git into tema1