Final push
Merge branch 'master' of https://github.com/thethirdman/rapport_stage