all my changes!
Merge branch 'develop' of https://github.com/mpmont/presentation into develop