tinifying
Merge branch 'MajorMegaMerge' of https://github.com/tortal/IT2-LP1-Tendu.git into MajorMegaMerge