Merge q3
Merge branch 'master' of github.com:blegat/LINMA1170