Added 'Conception générale' and 'Fonction Interprete' to the report
Added 'Fonction Mix' to report
Merge branch 'master' of https://github.com/xlambein/FSAB1402-Project