finish tp3 R
Merge branch 'master' of https://github.com/melkir/M1INFO