first commit
Merge https://github.com/dimitri001/TELEINF_PR2