tp 1,2 and exam 1
Merge branch 'master' of https://github.com/BenderV/SY26