Merge branch 'master' of https://github.com/vlecomte/rapport-q2